fix NLPchina#714 SQL parse error when where condition contains 'join' keyword

shi-yuan · shi-yuan · commit bbc412d151d5 · 2018-07-22T22:17:38.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.3.1.0</version>
+	<version>6.3.1.1</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/query/ESActionFactory.java b/src/main/java/org/nlpcn/es4sql/query/ESActionFactory.java
@@ -126,7 +126,7 @@ private static SQLStatementParser createSqlStatementParser(String sql) {
 
     private static boolean isJoin(SQLQueryExpr sqlExpr,String sql) {
         MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();
-        return query.getFrom() instanceof  SQLJoinTableSource && sql.toLowerCase().contains("join");
+        return query.getFrom() instanceof SQLJoinTableSource && ((SQLJoinTableSource) query.getFrom()).getJoinType() != SQLJoinTableSource.JoinType.COMMA && sql.toLowerCase().contains("join");
     }
 
     private static SQLExpr toSqlExpr(String sql) {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private static SQLStatementParser createSqlStatementParser(String sql) {`
`126`	`126`
`127`	`127`	`private static boolean isJoin(SQLQueryExpr sqlExpr,String sql) {`
`128`	`128`	`MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();`
`129`		`- return query.getFrom() instanceof SQLJoinTableSource && sql.toLowerCase().contains("join");`
	`129`	`+ return query.getFrom() instanceof SQLJoinTableSource && ((SQLJoinTableSource) query.getFrom()).getJoinType() != SQLJoinTableSource.JoinType.COMMA && sql.toLowerCase().contains("join");`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private static SQLExpr toSqlExpr(String sql) {`