fix #703

MyCATApache · Jun 15, 2022 · 8f45f28 · 8f45f28
1 parent e71d4ee
commit 8f45f28
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/hbt/src/main/java/io/mycat/calcite/RelToSqlConverter.java b/hbt/src/main/java/io/mycat/calcite/RelToSqlConverter.java
@@ -336,9 +336,20 @@ public Result visit(Project e) {
         addSelect(selectList, sqlExpr, e.getRowType());
         index++;
       }
-      for (Integer dupColumnPo : dupColumnPos) {
-        String alias = e.getRowType().getFieldList().get(dupColumnPo).getName() + "_" + dupColumnPo;
-        selectList.set(dupColumnPo,as(SqlLiteral.createNull(SqlParserPos.ZERO),alias));
+      for (Integer dupColumnIndex : dupColumnPos) {
+        String alias = e.getRowType().getFieldList().get(dupColumnIndex).getName() + "_" + dupColumnIndex;
+
+        SqlNode sqlNode = selectList.get(dupColumnIndex);
+
+        if (sqlNode instanceof SqlCall){
+          SqlCall sqlCall=  ((SqlCall) sqlNode);
+          if(sqlCall.getOperator().kind == SqlKind.AS){
+            SqlNode argNode = sqlCall.getOperandList().get(0);
+            selectList.set(dupColumnIndex,as(argNode,alias));
+            continue;//退出
+          }
+        }
+        selectList.set(dupColumnIndex,as(sqlNode,alias));
       }
 
       builder.setSelect(new SqlNodeList(selectList, POS));