fix bug with quailified columns in where clause

ClickHouse · Aug 29, 2018 · e007fd2 · e007fd2
1 parent 9cdd576
commit e007fd2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/contrib/poco b/contrib/poco
diff --git a/contrib/ssl b/contrib/ssl
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.cpp b/dbms/src/Interpreters/ExpressionAnalyzer.cpp
@@ -355,6 +355,16 @@ void ExpressionAnalyzer::translateQualifiedNamesImpl(ASTPtr & ast, const std::ve
     }
     else
     {
+        /// If the WHERE clause or HAVING consists of a single quailified column, the reference must be translated not only in children, but also in where_expression and having_expression.
+        if (ASTSelectQuery * select = typeid_cast<ASTSelectQuery *>(ast.get()))
+        {
+            if (select->prewhere_expression)
+                translateQualifiedNamesImpl(select->prewhere_expression, tables);
+            if (select->where_expression)
+                translateQualifiedNamesImpl(select->where_expression, tables);
+            if (select->having_expression)
+                translateQualifiedNamesImpl(select->having_expression, tables);
+        }        
         for (auto & child : ast->children)
         {
             /// Do not go to FROM, JOIN, subqueries.

diff --git a/dbms/tests/queries/0_stateless/00702_where_with_quailified_names.reference b/dbms/tests/queries/0_stateless/00702_where_with_quailified_names.reference
@@ -0,0 +1,5 @@
+retentionMerge
+retentionState
+retentionIf
+retentionNull
+retentionForEach
diff --git a/dbms/tests/queries/0_stateless/00702_where_with_quailified_names.sql b/dbms/tests/queries/0_stateless/00702_where_with_quailified_names.sql
@@ -0,0 +1 @@
+SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE func.is_aggregate LIMIT 5;