From ee9a18f0d9f935397d996bffff683a3aa24e1f5b Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Wed, 23 Nov 2022 14:51:58 +0100
Subject: [PATCH] Analyzer table functions untuple fix

---
 src/Analyzer/Passes/QueryAnalysisPass.cpp     | 20 +-------
 ...analyzer_table_functions_untuple.reference | 28 +++++++++++
 ...02493_analyzer_table_functions_untuple.sql | 47 +++++++++++++++++++
 3 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 tests/queries/0_stateless/02493_analyzer_table_functions_untuple.reference
 create mode 100644 tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql

diff --git a/src/Analyzer/Passes/QueryAnalysisPass.cpp b/src/Analyzer/Passes/QueryAnalysisPass.cpp
index 6e7a024f822..391a9582324 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.cpp
+++ b/src/Analyzer/Passes/QueryAnalysisPass.cpp
@@ -5455,25 +5455,7 @@ void QueryAnalyzer::resolveQueryJoinTreeNode(QueryTreeNodePtr & join_tree_node,
                 }
             }
 
-            /// TODO: Special functions that can take query
-            /// TODO: Support qualified matchers for table function
-
-            for (auto & argument_node : table_function_node.getArguments().getNodes())
-            {
-                if (argument_node->getNodeType() == QueryTreeNodeType::MATCHER)
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Matcher as table function argument is not supported {}. In scope {}",
-                        join_tree_node->formatASTForErrorMessage(),
-                        scope.scope_node->formatASTForErrorMessage());
-                }
-
-                auto * function_node = argument_node->as<FunctionNode>();
-                if (function_node && table_function_factory.hasNameOrAlias(function_node->getFunctionName()))
-                    continue;
-
-                resolveExpressionNode(argument_node, scope, false /*allow_lambda_expression*/, true /*allow_table_expression*/);
-            }
+            resolveExpressionNodeList(table_function_node.getArgumentsNode(), scope, false /*allow_lambda_expression*/, true /*allow_table_expression*/);
 
             auto table_function_ast = table_function_node.toAST();
             table_function_ptr->parseArguments(table_function_ast, scope_context);
diff --git a/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.reference b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.reference
new file mode 100644
index 00000000000..c9a8d73701d
--- /dev/null
+++ b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.reference
@@ -0,0 +1,28 @@
+0
+--
+0
+1
+--
+1
+2
+--
+(1)	0
+--
+(0,1)	0
+--
+(1,2)	1
+(1,2)	2
+--
+(1)	0
+--
+(0,1)	0
+--
+(1,2)	1
+(1,2)	2
+--
+('1')	0
+--
+('0','1')	0
+--
+('1','2')	1
+('1','2')	2
diff --git a/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql
new file mode 100644
index 00000000000..bdbe65c643b
--- /dev/null
+++ b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql
@@ -0,0 +1,47 @@
+SET allow_experimental_analyzer = 1;
+
+SELECT number FROM numbers(untuple(tuple(1)));
+
+SELECT '--';
+
+SELECT number FROM numbers(untuple(tuple(0, 2)));
+
+SELECT '--';
+
+SELECT number FROM numbers(untuple(tuple(1, 2)));
+
+SELECT '--';
+
+SELECT cast(tuple(1), 'Tuple(value UInt64)') AS value, number FROM numbers(untuple(value));
+
+SELECT '--';
+
+SELECT cast(tuple(0, 1), 'Tuple(value_1 UInt64, value_2 UInt64)') AS value, number FROM numbers(untuple(value));
+
+SELECT '--';
+
+SELECT cast(tuple(1, 2), 'Tuple(value_1 UInt64, value_2 UInt64)') AS value, number FROM numbers(untuple(value));
+
+SELECT '--';
+
+SELECT cast(tuple(1), 'Tuple(value UInt64)') AS value, number FROM numbers(value.*);
+
+SELECT '--';
+
+SELECT cast(tuple(0, 1), 'Tuple(value_1 UInt64, value_2 UInt64)') AS value, number FROM numbers(value.*);
+
+SELECT '--';
+
+SELECT cast(tuple(1, 2), 'Tuple(value_1 UInt64, value_2 UInt64)') AS value, number FROM numbers(value.*);
+
+SELECT '--';
+
+SELECT cast(tuple('1'), 'Tuple(value String)') AS value, number FROM numbers(value.* APPLY x -> toUInt64(x));
+
+SELECT '--';
+
+SELECT cast(tuple('0', '1'), 'Tuple(value_1 String, value_2 String)') AS value, number FROM numbers(value.* APPLY x -> toUInt64(x));
+
+SELECT '--';
+
+SELECT cast(tuple('1', '2'), 'Tuple(value_1 String, value_2 String)') AS value, number FROM numbers(value.* APPLY x -> toUInt64(x));