thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 09:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated executeTableFunctions in Context.cpp to check for table/view & fallback to function to fix test fails - 40907 Parameterized views as table functions

Browse Source
This commit is contained in:
Smita Kulkarni 2022-09-28 10:00:12 +02:00
parent a12d2fcf44
commit 618f63d6c7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Interpreters/Context.cpp
View File

@ -1129,7 +1129,17 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression)
{ {
if (const auto * function = table_expression->as<ASTFunction>()) if (const auto * function = table_expression->as<ASTFunction>())
{ {
if (TableFunctionFactory::instance().isTableFunctionName(function->name)) if (DatabaseCatalog::instance().isTableExist({getCurrentDatabase(), function->name}, getQueryContext()))
{
StoragePtr res = DatabaseCatalog::instance().getTable({getCurrentDatabase(), function->name}, getQueryContext());
if (res.get()->isView() && res->as<StorageView>()->isParameterizedView())
return res;
else
{
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not a parameterized view `{}`", function->name);
}
}
else
{ {
auto hash = table_expression->getTreeHash(); auto hash = table_expression->getTreeHash();
String key = toString(hash.first) + '_' + toString(hash.second); String key = toString(hash.first) + '_' + toString(hash.second);
@ -1163,17 +1173,6 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression)
} }
return res; return res;
} }
else if (DatabaseCatalog::instance().isTableExist({getCurrentDatabase(), function->name}, getQueryContext()))
{
StoragePtr res = DatabaseCatalog::instance().getTable({getCurrentDatabase(), function->name}, getQueryContext());
if (res.get()->isView() && res->as<StorageView>()->isParameterizedView())
return res;
else
{
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not a parameterized view `{}`", function->name);
}
}
throw Exception(ErrorCodes::UNKNOWN_FUNCTION, "Unknown table function or incorrect parameterized view: `{}`", function->name);
} }
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unable to fetch function from query"); throw Exception(ErrorCodes::LOGICAL_ERROR, "Unable to fetch function from query");
} }