fix some regression test

seawinde · Nov 15, 2023 · 8f889c2 · 8f889c2
1 parent bf92ab4
commit 8f889c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -307,6 +307,7 @@
 import org.apache.doris.nereids.trees.plans.LimitPhase;
 import org.apache.doris.nereids.trees.plans.Plan;
 import org.apache.doris.nereids.trees.plans.algebra.Aggregate;
+import org.apache.doris.nereids.trees.plans.algebra.OneRowRelation;
 import org.apache.doris.nereids.trees.plans.algebra.SetOperation.Qualifier;
 import org.apache.doris.nereids.trees.plans.commands.AlterMTMVCommand;
 import org.apache.doris.nereids.trees.plans.commands.Command;
@@ -2414,6 +2415,9 @@ private LogicalPlan withSelectQuerySpecification(
                 }
                 return new LogicalHaving<>(ExpressionUtils.extractConjunctionToSet(
                         getExpression((havingClause.get().booleanExpression()))), project);
+            } else if (inputRelation instanceof OneRowRelation) {
+                // If OneRowRelation should not add project, because slot will be wrong when analyze
+                return withHaving(aggregate, havingClause);
             } else {
                 LogicalPlan having = withHaving(aggregate, havingClause);
                 return withProjection(having, selectColumnCtx, aggClause, isDistinct);

diff --git a/regression-test/data/query_p0/sql_functions/conditional_functions/test_if_cast.out b/regression-test/data/query_p0/sql_functions/conditional_functions/test_if_cast.out
@@ -15,5 +15,5 @@
 ["1970-01-01"]
 
 -- !select --
-[null]
+[NULL]
 
diff --git a/regression-test/suites/nereids_syntax_p0/bind_priority.groovy b/regression-test/suites/nereids_syntax_p0/bind_priority.groovy
@@ -116,7 +116,7 @@ suite("bind_priority") {
 
     test{
         sql "SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=1"
-        exception "a is ambiguous: a#0, a#1."
+        exception "a is ambiguous: a#1, a#2."
     }
 
     sql "drop table if exists duplicate_slot";
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,5 +15,5 @@ @@
     ["1970-01-01"]
     -- !select --
-    [null]
+    [NULL]