Merge branch '1.5_v3.5.3_bugfix' into '1.5_v3.5.3'

toutian · toutian · commit 3e7d88c831ca · 2019-06-20T10:03:25.000+08:00
【flink-sql】维表join bug

修复select中有case语法

See merge request !20
diff --git a/core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java b/core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java
@@ -435,7 +435,7 @@ private SqlNode replaceSelectFieldName(SqlNode selectNode, HashBasedTable<String
                 }
             }
 
-            replaceSelectFieldName(elseNode, mappingTable, tableAlias);
+            ((SqlCase) selectNode).setOperand(3, replaceSelectFieldName(elseNode, mappingTable, tableAlias));
             return selectNode;
         }else if(selectNode.getKind() == OTHER){
             //不处理

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ private SqlNode replaceSelectFieldName(SqlNode selectNode, HashBasedTable<String`
`435`	`435`	`}`
`436`	`436`	`}`
`437`	`437`
`438`		`- replaceSelectFieldName(elseNode, mappingTable, tableAlias);`
	`438`	`+ ((SqlCase) selectNode).setOperand(3, replaceSelectFieldName(elseNode, mappingTable, tableAlias));`
`439`	`439`	`return selectNode;`
`440`	`440`	`}else if(selectNode.getKind() == OTHER){`
`441`	`441`	`//不处理`