#1505 fix using bug (#1508)

actiontech · Nov 20, 2019 · 24b4a4e · 24b4a4e
1 parent 211c3e5
commit 24b4a4e
Showing 1 changed file with 43 additions and 2 deletions.
diff --git a/src/main/java/com/actiontech/dble/route/parser/druid/ServerSchemaStatVisitor.java b/src/main/java/com/actiontech/dble/route/parser/druid/ServerSchemaStatVisitor.java
@@ -153,9 +153,49 @@ public boolean visit(SQLJoinTableSource x) {
                 inOuterJoin = false;
                 break;
         }
-        boolean result = super.visit(x);
+
+        SQLTableSource left = x.getLeft(), right = x.getRight();
+
+        left.accept(this);
+        right.accept(this);
+
+        SQLExpr condition = x.getCondition();
+        if (condition != null) {
+            condition.accept(this);
+        }
+
+        if (x.getUsing().size() > 0 &&
+                left instanceof SQLExprTableSource && right instanceof SQLExprTableSource) {
+            SQLExpr leftExpr = ((SQLExprTableSource) left).getExpr();
+            SQLExpr rightExpr = ((SQLExprTableSource) right).getExpr();
+
+            for (SQLExpr expr : x.getUsing()) {
+                if (expr instanceof SQLIdentifierExpr) {
+                    String name = ((SQLIdentifierExpr) expr).getName();
+                    /*
+                    when the shard1 a join shard2 b using(id)
+                    the intermediate condition should be a.id = b.id instead of shard1.id = shard2.id
+                     */
+                    SQLPropertyExpr leftPropExpr = new SQLPropertyExpr(leftExpr, name);
+                    if (left.getAlias() != null) {
+                        leftPropExpr.setOwner(left.getAlias());
+                    }
+                    SQLPropertyExpr rightPropExpr = new SQLPropertyExpr(rightExpr, name);
+                    if (right.getAlias() != null) {
+                        rightPropExpr.setOwner(right.getAlias());
+                    }
+
+                    leftPropExpr.setResolvedTableSource(left);
+                    rightPropExpr.setResolvedTableSource(right);
+
+                    SQLBinaryOpExpr usingCondition = new SQLBinaryOpExpr(leftPropExpr, SQLBinaryOperator.Equality, rightPropExpr);
+                    usingCondition.accept(this);
+                }
+            }
+        }
+
         inOuterJoin = false;
-        return result;
+        return false;
     }
 
     @Override
@@ -229,6 +269,7 @@ public boolean visit(SQLBetweenExpr x) {
         return true;
     }
 
+
     @Override
     public boolean visit(SQLBinaryOpExpr x) {
         if (isUnaryParentEffect(x)) return true;