Merge commit '32cb792c9b24a2517a309536d0ef2d7433822548' into elastic2.0

eliranmoyal · eliranmoyal · commit 671d5e3e5209 · 2015-12-30T11:09:42.000+02:00
Conflicts:
	.travis.yml
diff --git a/src/main/java/org/nlpcn/es4sql/parse/ElasticSqlExprParser.java b/src/main/java/org/nlpcn/es4sql/parse/ElasticSqlExprParser.java
@@ -68,7 +68,7 @@ else if(lexer.token() == Token.LBRACKET){
             lexer.nextToken();
             String prefix = "";
             while(lexer.token()!=Token.RBRACKET){
-                if(lexer.token() != Token.IDENTIFIER && lexer.token()!=Token.INDEX){
+                if(lexer.token() != Token.IDENTIFIER && lexer.token()!=Token.INDEX && lexer.token()!=Token.LITERAL_CHARS){
                     throw new ParserException("All items between Brackets should be identifiers , got:" +lexer.token());
                 }
                 identifier.append(prefix);
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -756,7 +756,17 @@ public void scriptOnFilterWithParams() throws SqlParseException {
 
     }
 
-
+    @Test
+    public void fieldsAsNumbersOnWhere() throws SqlParseException {
+        String query = "select * from x where ['3'] > 2";
+        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+        LinkedList<Where> wheres = select.getWhere().getWheres();
+        Assert.assertEquals(1, wheres.size());
+        Where where = wheres.get(0);
+        Assert.assertEquals(Condition.class,where.getClass());
+        Condition condition = (Condition) where;
+        int i=1;
+    }
 
     private SQLExpr queryToExpr(String query) {
         return new ElasticSqlExprParser(query).expr();

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ else if(lexer.token() == Token.LBRACKET){`
`68`	`68`	`lexer.nextToken();`
`69`	`69`	`String prefix = "";`
`70`	`70`	`while(lexer.token()!=Token.RBRACKET){`
`71`		`- if(lexer.token() != Token.IDENTIFIER && lexer.token()!=Token.INDEX){`
	`71`	`+ if(lexer.token() != Token.IDENTIFIER && lexer.token()!=Token.INDEX && lexer.token()!=Token.LITERAL_CHARS){`
`72`	`72`	`throw new ParserException("All items between Brackets should be identifiers , got:" +lexer.token());`
`73`	`73`	`}`
`74`	`74`	`identifier.append(prefix);`