thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 18:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better

Browse Source
This commit is contained in:
Nikolay Degterinsky 2023-04-13 08:58:51 +00:00
parent 1be35ff821
commit 10362c28bf
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/TableFunctions/TableFunctionExecutable.cpp
View File

@ -25,7 +25,7 @@ namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
extern const int UNSUPPORTED_METHOD;
extern const int BAD_ARGUMENTS;
}
std::vector<size_t> TableFunctionExecutable::skipAnalysisForArguments(const QueryTreeNodePtr & query_node_table_function, ContextPtr) const
@ -56,11 +56,16 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
auto args = function->arguments->children;
if (args.size() < 3 || args[2]->as<ASTSetQuery>())
if (args.size() < 3)
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
"Table function '{}' requires minimum 3 arguments: script_name, format, structure, [input_query...]",
getName());
if (args[2]->as<ASTSetQuery>())
throw Exception(ErrorCodes::BAD_ARGUMENTS,
"Table function '{}' requires 3 mandatory arguments: script_name, format, structure",
getName());
for (size_t i = 0; i <= 2; ++i)
args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args[i], context);
@ -83,15 +88,18 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
}
else
{
ASTPtr query = args[i]->children.at(0);
if (query->as<ASTSelectWithUnionQuery>())
ASTPtr query;
if (!args[i]->children.empty())
query = args[i]->children.at(0);
if (query && query->as<ASTSelectWithUnionQuery>())
{
input_queries.emplace_back(std::move(query));
}
else
{
throw Exception(
ErrorCodes::UNSUPPORTED_METHOD,
ErrorCodes::BAD_ARGUMENTS,
"Table function '{}' argument is invalid {}",
getName(),
args[i]->formatForErrorMessage());

4
tests/queries/0_stateless/02377_executable_function_settings.sql
View File

@ -4,4 +4,6 @@ EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_
SELECT '--------------------';
EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_command_execution_time=100, command_read_timeout=1);
SELECT '--------------------';
EXPLAIN SYNTAX SELECT * from executable('JSON', 'data String', SETTINGS max_command_execution_time=100); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
SELECT * from executable('JSON', 'data String', SETTINGS max_command_execution_time=100); -- { serverError BAD_ARGUMENTS }
SELECT * from executable('JSON', 'data String', 'TEST', 'TEST'); -- { serverError BAD_ARGUMENTS }