[fix](planner) fix bug of select stmt toSql (apache#37274) (apache#37346

) cherry-pick from master apache#37274
mongo360 · Jul 24, 2024 · 842783b · 842783b
1 parent 35f95f4
commit 842783b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
@@ -553,6 +553,7 @@ public void analyze(Analyzer analyzer) throws UserException {
             // remove excepted columns
             resultExprs.removeIf(expr -> exceptCols.contains(expr.toColumnLabel()));
             colLabels.removeIf(exceptCols::contains);
+            originalExpr = new ArrayList<>(resultExprs);
         } else {
             if (needToSql) {
                 originalExpr = new ArrayList<>();

diff --git a/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out b/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out
@@ -1,10 +1,13 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !test_select_star_except --
-1	1
-2	1
-3	5
-4	5
-6	\N
+1	2
+2	3
+3	6
+4	6
+6	6
+
+-- !test_select_star_except_sql --
+v_mal_old_create_view	CREATE VIEW `v_mal_old_create_view` AS SELECT `default_cluster:regression_test_view_p0`.`mal_old_create_view`.`pk` AS `pk`, `default_cluster:regression_test_view_p0`.`mal_old_create_view`.`b` AS `b` FROM `default_cluster:regression_test_view_p0`.`mal_old_create_view`;	utf8	utf8_general_ci
 
 -- !test_sql --
 v_mal_old_create_view2	CREATE VIEW `v_mal_old_create_view2` AS SELECT CAST(CAST(`a` AS TEXT) AS TIME(0)) AS `CAST(CAST(``a`` AS TEXT) AS TIME(0))` FROM `default_cluster:regression_test_view_p0`.`mal_old_create_view`;	utf8	utf8_general_ci

diff --git a/regression-test/suites/view_p0/create_view_star_except_and_cast_to_sql.groovy b/regression-test/suites/view_p0/create_view_star_except_and_cast_to_sql.groovy
@@ -17,7 +17,6 @@
 
 suite("create_view_star_except_and_cast_to_sql") {
     sql "SET enable_nereids_planner=false;"
-
     sql """
          DROP TABLE IF EXISTS mal_old_create_view
         """
@@ -35,6 +34,7 @@ suite("create_view_star_except_and_cast_to_sql") {
     sql "create view v_mal_old_create_view as select * except(a) from mal_old_create_view"
 
     qt_test_select_star_except "select * from v_mal_old_create_view order by pk,b"
+    qt_test_select_star_except_sql "show create view v_mal_old_create_view"
 
     sql "drop view if EXISTS v_mal_old_create_view2"