NLPchina#131 bug fix complex_nested on left side on binaryOp

eliranmoyal · eliranmoyal · commit f231da8e8b50 · 2016-01-01T16:33:15.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/parse/SqlParser.java b/src/main/java/org/nlpcn/es4sql/parse/SqlParser.java
@@ -83,13 +83,13 @@ private Where findWhere(SQLExpr where) throws SqlParseException {
 	private boolean isCond(SQLBinaryOpExpr expr) {
         SQLExpr leftSide = expr.getLeft();
         if(leftSide instanceof SQLMethodInvokeExpr){
-            return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide);
+            return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide,expr.getOperator());
         }
 		return leftSide instanceof SQLIdentifierExpr || leftSide instanceof SQLPropertyExpr || leftSide instanceof SQLVariantRefExpr;
 	}
 
-    private boolean isAllowedMethodOnConditionLeft(SQLMethodInvokeExpr method) {
-        return  method.getMethodName().toLowerCase().equals("nested");
+    private boolean isAllowedMethodOnConditionLeft(SQLMethodInvokeExpr method, SQLBinaryOperator operator) {
+        return  method.getMethodName().toLowerCase().equals("nested") && !operator.isLogical();
     }
 
     public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -771,6 +771,17 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {
         Assert.assertEquals("3", condition.getName());
     }
 
+
+    @Test
+    public void complexNestedAndOtherQuery() throws SqlParseException {
+        String query = "select * from x where nested('path',path.x=3) and y=3";
+        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+        LinkedList<Where> wheres = select.getWhere().getWheres();
+        Assert.assertEquals(2, wheres.size());
+        Assert.assertEquals("AND path NESTED_COMPLEX AND ( AND path.x EQ 3 ) ",wheres.get(0).toString());
+        Assert.assertEquals("AND y EQ 3",wheres.get(1).toString());
+    }
+
     private SQLExpr queryToExpr(String query) {
         return new ElasticSqlExprParser(query).expr();
     }

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ private Where findWhere(SQLExpr where) throws SqlParseException {`
`83`	`83`	`private boolean isCond(SQLBinaryOpExpr expr) {`
`84`	`84`	`SQLExpr leftSide = expr.getLeft();`
`85`	`85`	`if(leftSide instanceof SQLMethodInvokeExpr){`
`86`		`- return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide);`
	`86`	`+ return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide,expr.getOperator());`
`87`	`87`	`}`
`88`	`88`	`return leftSide instanceof SQLIdentifierExpr \|\| leftSide instanceof SQLPropertyExpr \|\| leftSide instanceof SQLVariantRefExpr;`
`89`	`89`	`}`
`90`	`90`
`91`		`- private boolean isAllowedMethodOnConditionLeft(SQLMethodInvokeExpr method) {`
`92`		`- return method.getMethodName().toLowerCase().equals("nested");`
	`91`	`+ private boolean isAllowedMethodOnConditionLeft(SQLMethodInvokeExpr method, SQLBinaryOperator operator) {`
	`92`	`+ return method.getMethodName().toLowerCase().equals("nested") && !operator.isLogical();`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {`