inner 1504 - fix or condition in on join filter

smarticeberg · Jan 7, 2022 · a49f5e4 · a49f5e4
1 parent 0af53cc
commit a49f5e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.../java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/GlobalVisitor.java b/.../java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/GlobalVisitor.java
@@ -224,9 +224,12 @@ protected void visit(JoinNode join) {
             if (first) {
                 sqlBuilder.append(" on ");
             } else {
-                joinOnFilterStr.append(" and ");
+                joinOnFilterStr.append(" and (");
             }
             joinOnFilterStr.append(join.getOtherJoinOnFilter());
+            if (!first) {
+                joinOnFilterStr.append(")");
+            }
         }
         sqlBuilder.append(joinOnFilterStr.toString());
         if (join.isWithSubQuery() || isTopQuery) {

diff --git a/...ava/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/PushDownVisitor.java b/...ava/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/PushDownVisitor.java
@@ -208,9 +208,12 @@ private StringBuilder getJoinOn(JoinNode join) {
             if (first) {
                 sqlBuilder.append(" on ");
             } else {
-                joinOnFilterStr.append(" and ");
+                joinOnFilterStr.append(" and (");
             }
             joinOnFilterStr.append(join.getOtherJoinOnFilter());
+            if (!first) {
+                joinOnFilterStr.append(")");
+            }
         }
         return joinOnFilterStr;
     }