Merge pull request ClickHouse#80431 from ClickHouse/fix-udf

Fix ClickHouse#80429 Logical error: SQL user defined function ... must represent lambda expression

Author: alexey-milovidov

src/Analyzer/Resolve/QueryAnalyzer.cpp

@@ -29,7 +29,7 @@ namespace ErrorCodes
     extern const int FUNCTION_ALREADY_EXISTS;
     extern const int CANNOT_DROP_FUNCTION;
     extern const int CANNOT_CREATE_RECURSIVE_FUNCTION;
-    extern const int UNSUPPORTED_METHOD;
+    extern const int BAD_ARGUMENTS;
 }
 
 
@@ -52,17 +52,17 @@ namespace
         ASTFunction * lambda_function = function->as<ASTFunction>();
 
         if (!lambda_function)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Expected function, got: {}", function->formatForErrorMessage());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected function, got: {}", function->formatForErrorMessage());
 
         auto & lambda_function_expression_list = lambda_function->arguments->children;
 
         if (lambda_function_expression_list.size() != 2)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Lambda must have arguments and body");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Lambda must have arguments and body");
 
         const ASTFunction * tuple_function_arguments = lambda_function_expression_list[0]->as<ASTFunction>();
 
-        if (!tuple_function_arguments || !tuple_function_arguments->arguments)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Lambda must have valid arguments");
+        if (!tuple_function_arguments || !tuple_function_arguments->arguments || tuple_function_arguments->name != "tuple")
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Lambda must have valid arguments");
 
         std::unordered_set<String> arguments;
 
@@ -71,17 +71,17 @@ namespace
             const auto * argument_identifier = argument->as<ASTIdentifier>();
 
             if (!argument_identifier)
-                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Lambda argument must be identifier");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Lambda argument must be identifier");
 
             const auto & argument_name = argument_identifier->name();
             auto [_, inserted] = arguments.insert(argument_name);
             if (!inserted)
-                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Identifier {} already used as function parameter", argument_name);
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Identifier {} already used as function parameter", argument_name);
         }
 
         ASTPtr function_body = lambda_function_expression_list[1];
         if (!function_body)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Lambda must have valid function body");
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Lambda must have valid function body");
 
         validateFunctionRecursiveness(*function_body, name);
     }

src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp

@@ -1,8 +1,6 @@
 #include <Parsers/ParserCreateFunctionQuery.h>
 
 #include <Parsers/ASTCreateFunctionQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>

src/Parsers/ParserCreateFunctionQuery.cpp

@@ -1,4 +1,4 @@
-CREATE FUNCTION 02181_invalid_lambda AS lambda(((x * 2) AS x_doubled) + x_doubled); --{serverError UNSUPPORTED_METHOD}
-CREATE FUNCTION 02181_invalid_lambda AS lambda(x); --{serverError UNSUPPORTED_METHOD}
-CREATE FUNCTION 02181_invalid_lambda AS lambda(); --{serverError UNSUPPORTED_METHOD}
-CREATE FUNCTION 02181_invalid_lambda AS lambda(tuple(x)) --{serverError UNSUPPORTED_METHOD}
+CREATE FUNCTION 02181_invalid_lambda AS lambda(((x * 2) AS x_doubled) + x_doubled); --{serverError BAD_ARGUMENTS}
+CREATE FUNCTION 02181_invalid_lambda AS lambda(x); --{serverError BAD_ARGUMENTS}
+CREATE FUNCTION 02181_invalid_lambda AS lambda(); --{serverError BAD_ARGUMENTS}
+CREATE FUNCTION 02181_invalid_lambda AS lambda(tuple(x)) --{serverError BAD_ARGUMENTS}

tests/queries/0_stateless/02181_sql_user_defined_functions_invalid_lambda.sql

@@ -1 +1 @@
-create function foo as x -- { serverError UNSUPPORTED_METHOD }
+create function foo as x -- { serverError BAD_ARGUMENTS }

tests/queries/0_stateless/02292_create_function_validate.sql

@@ -0,0 +1 @@
+CREATE OR REPLACE FUNCTION 03518_bad_sql_udf AS lambda(identity(x), x); -- { serverError BAD_ARGUMENTS }