Merge commit '2286659420d1192abc687bd0772cd72cf725cb0d' into elastic2.0

eliranmoyal · eliranmoyal · commit 316c18e4ef0f · 2016-03-18T18:58:38.000+02:00
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ Versions
 | 2.0.0                 | 2.0.3          | delete commands not supported  | elastic2.0   |
 | 2.1.0                 | 2.1.0.1        | delete commands not supported  | elastic2.1   |
 | 2.1.1                 | 2.1.1          | delete commands not supported  | elastic2.1.1 |
+| 2.2.0                 | 2.2.0          | delete commands not supported  | elastic2.2.0 |
 
 ### Elasticsearch 1.X
 ````
@@ -45,6 +46,10 @@ Versions
 ````
 ./bin/plugin install https://github.com/NLPchina/elasticsearch-sql/releases/download/2.1.1/elasticsearch-sql-2.1.1.zip 
 ````
+### Elasticsearch 2.2.0
+````
+./bin/plugin install https://github.com/NLPchina/elasticsearch-sql/releases/download/2.2.0/elasticsearch-sql-2.2.0.zip 
+````
 After doing this, you need to restart the Elasticsearch server. Otherwise you may get errors like `Invalid index name [sql], must not start with '']; ","status":400}`.
 
 ## Basic Usage
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
@@ -413,14 +413,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`	`}`