Duplicate column bug #299

src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/GlobalVisitor.java

@@ -148,10 +148,9 @@ public class GlobalVisitor extends MysqlVisitor {
         if (!isTopQuery) {
             sqlBuilder.append(" ( ");
         }
-        if (join.isSubQuery() || isTopQuery) {
-            buildSelect(join);
-            sqlBuilder.append(" from ");
-        }
+
+        buildSelect(join);
+        sqlBuilder.append(" from ");
 
         PlanNode left = join.getLeftNode();
         MysqlVisitor leftVisitor = new GlobalVisitor(left, false);
@@ -184,22 +183,18 @@ public class GlobalVisitor extends MysqlVisitor {
         }
 
         if (join.getOtherJoinOnFilter() != null) {
-            if (first) {
-                first = false;
-            } else {
+            if (!first) {
                 joinOnFilterStr.append(" and ");
             }
 
             joinOnFilterStr.append(join.getOtherJoinOnFilter());
         }
         sqlBuilder.append(joinOnFilterStr.toString());
-        if (join.isSubQuery() || isTopQuery) {
-            buildWhere(join);
-            buildGroupBy(join);
-            buildHaving(join);
-            buildOrderBy(join);
-            buildLimit(join);
-        }
+        buildWhere(join);
+        buildGroupBy(join);
+        buildHaving(join);
+        buildOrderBy(join);
+        buildLimit(join);
 
         if (!isTopQuery) {
             sqlBuilder.append(" ) ");

src/main/java/com/actiontech/dble/plan/visitor/MySQLPlanNodeVisitor.java

@@ -237,7 +237,7 @@ public class MySQLPlanNodeVisitor {
         this.tableNode.setSubQuery(true);
         if (subQueryTables.getAlias() != null) {
             tableNode.alias(subQueryTables.getAlias());
-            if (tableNode.getSubAlias() == null) {
+            if (tableNode.getSubAlias() == null && tableNode.type() == PlanNode.PlanNodeType.TABLE) {
                 tableNode.setSubAlias(tableNode.getAlias());
             }
         }