semi colons allowed on index name NLPchina#166

eliranmoyal · eliranmoyal · commit 2286659420d1 · 2016-03-12T17:37:22.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/parse/ElasticLexer.java b/src/main/java/org/nlpcn/es4sql/parse/ElasticLexer.java
@@ -88,6 +88,6 @@ public void scanIdentifier() {
 
 
     private boolean isElasticIdentifierChar(char ch) {
-        return ch == '*' || ch == ':' || ch == '-'  || ch == '.' || isIdentifierChar(ch);
+        return ch == '*' || ch == ':' || ch == '-'  || ch == '.' || ch == ';' || isIdentifierChar(ch);
     }
 }
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -414,14 +414,23 @@ public void innerQueryTestTwoQueries() throws SqlParseException {
     }
 
     @Test
-    public void indexWithDotsAndHyphen() throws SqlParseException {
+     public void indexWithDotsAndHyphen() throws SqlParseException {
         String query = "select * from data-2015.08.22";
         SQLExpr sqlExpr = queryToExpr(query);
         Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
         Assert.assertEquals(1,select.getFrom().size());
         Assert.assertEquals("data-2015.08.22",select.getFrom().get(0).getIndex());
     }
 
+    @Test
+    public void indexWithSemiColons() throws SqlParseException {
+        String query = "select * from some;index";
+        SQLExpr sqlExpr = queryToExpr(query);
+        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+        Assert.assertEquals(1,select.getFrom().size());
+        Assert.assertEquals("some;index",select.getFrom().get(0).getIndex());
+    }
+
     @Test
     public void scriptFiledPlusLiteralTest() throws SqlParseException {
         String query = "SELECT field1 + 3 FROM index/type";

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,6 @@ public void scanIdentifier() {`
`88`	`88`
`89`	`89`
`90`	`90`	`private boolean isElasticIdentifierChar(char ch) {`
`91`		`- return ch == '*' \|\| ch == ':' \|\| ch == '-' \|\| ch == '.' \|\| isIdentifierChar(ch);`
	`91`	`+ return ch == '*' \|\| ch == ':' \|\| ch == '-' \|\| ch == '.' \|\| ch == ';' \|\| isIdentifierChar(ch);`
`92`	`92`	`}`
`93`	`93`	`}`