diff --git a/src/main/java/org/caosdb/server/query/CQLLexer.g4 b/src/main/java/org/caosdb/server/query/CQLLexer.g4 index 74331e0fa33a599e679e01a5b669c1c7ac9b4da5..71b41d480bc171aa02af3b2e61eadd16345b3c6d 100644 --- a/src/main/java/org/caosdb/server/query/CQLLexer.g4 +++ b/src/main/java/org/caosdb/server/query/CQLLexer.g4 @@ -502,7 +502,7 @@ mode DOUBLE_QUOTE_MODE; mode SELECT_MODE; FROM: - [Ff][Rr][Oo][Mm]([ \t\n\r])? -> mode(DEFAULT_MODE) + [Ff][Rr][Oo][Mm]([ \t\n\r])* -> mode(DEFAULT_MODE) ; SELECT_DOT: diff --git a/src/test/java/org/caosdb/server/query/TestCQL.java b/src/test/java/org/caosdb/server/query/TestCQL.java index 92e82902215d5e127ef67941ba70a14d535bba82..62aeb5ed3f003090b54a1f3f7a384d0bd3e7fec4 100644 --- a/src/test/java/org/caosdb/server/query/TestCQL.java +++ b/src/test/java/org/caosdb/server/query/TestCQL.java @@ -239,6 +239,7 @@ public class TestCQL { String queryIssue116 = "FIND *"; String queryIssue132a = "FIND ENTITY WHICH HAS BEEN INSERTED AFTER TODAY"; String queryIssue132b = "FIND ENTITY WHICH HAS BEEN CREATED TODAY BY ME"; + String queryIssue134 = "SELECT pname FROM ename"; // File paths /////////////////////////////////////////////////////////////// String filepath_verb01 = "/foo/"; @@ -6718,4 +6719,19 @@ public class TestCQL { assertEquals("TRANS(Insert,(,Today,Transactor(null,=))", sfq.filter.toString()); } + + /* + * String queryIssue134 = "SELECT pname FROM ename"; + */ + @Test + public void testIssue134() { + CQLLexer lexer; + lexer = new CQLLexer(CharStreams.fromString(this.queryIssue134)); + final CommonTokenStream tokens = new CommonTokenStream(lexer); + + final CQLParser parser = new CQLParser(tokens); + final CqContext sfq = parser.cq(); + Query q = new Query(this.queryIssue134); + q.parse(); + } }