From f6a4bc0ec721ae43af91d7afee1795738e040f41 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:12:03 +0000
Subject: [PATCH] Backport #71476 to 24.8: Fix constants in WHERE expression
 which could apparently contain Join.

---
 src/Interpreters/ExpressionAnalyzer.cpp       |  8 +++++--
 ...3258_old_analyzer_const_expr_bug.reference |  0
 .../03258_old_analyzer_const_expr_bug.sql     | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.reference
 create mode 100644 tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.sql

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 7063b2162a0..5e7cdf24d2b 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -1960,7 +1960,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                 Block before_prewhere_sample = source_header;
                 if (sanitizeBlock(before_prewhere_sample))
                 {
-                    before_prewhere_sample = prewhere_dag_and_flags->dag.updateHeader(before_prewhere_sample);
+                    ExpressionActions(
+                        prewhere_dag_and_flags->dag.clone(),
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_prewhere_sample);
                     auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1992,7 +1994,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                     before_where_sample = source_header;
                 if (sanitizeBlock(before_where_sample))
                 {
-                    before_where_sample = before_where->dag.updateHeader(before_where_sample);
+                    ExpressionActions(
+                        before_where->dag.clone(),
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_where_sample);
 
                     auto & column_elem
                         = before_where_sample.getByName(query.where()->getColumnName());
diff --git a/tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.reference b/tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.sql b/tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.sql
new file mode 100644
index 00000000000..913de3b849c
--- /dev/null
+++ b/tests/queries/0_stateless/03258_old_analyzer_const_expr_bug.sql
@@ -0,0 +1,23 @@
+WITH
+  multiIf('-1' = '-1', 10080, '-1' = '7', 60, '-1' = '1', 5, 1440) AS interval_start, -- noqa
+  multiIf('-1' = '-1', CEIL((today() - toDate('2017-06-22')) / 7)::UInt16, '-1' = '7', 168, '-1' = '1', 288, 90) AS days_run, -- noqa:L045
+  block_time as (SELECT arrayJoin(
+        arrayMap(
+            i -> toDateTime(toStartOfInterval(now(), INTERVAL interval_start MINUTE) - interval_start * 60 * i, 'UTC'),
+            range(days_run)
+        )
+    )),
+
+sales AS (
+    SELECT
+        toDateTime(toStartOfInterval(now(), INTERVAL interval_start MINUTE), 'UTC') AS block_time
+    FROM
+        numbers(1)
+    GROUP BY
+        block_time
+    ORDER BY
+        block_time)
+
+SELECT
+    block_time
+FROM sales where block_time >= (SELECT MIN(block_time) FROM sales) format Null;