Skip to content

Backport #91159 to 25.11: Improve DDLDependencyVisitor #91180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clickhouse-gh merged 1 commit into from
Dec 1, 2025
Merged

Backport #91159 to 25.11: Improve DDLDependencyVisitor #91180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions src/Databases/DDLDependencyVisitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,34 +387,32 @@ namespace

const auto & arg = args[arg_idx];

if (evaluate)
if (const auto * id = arg->as<ASTIdentifier>())
return id->name();

if (const auto * literal = arg->as<ASTLiteral>())
{
try
{
/// We're just searching for dependencies here, it's not safe to execute subqueries now.
/// Use copy of the global_context and set current database, because expressions can contain currentDatabase() function.
ContextMutablePtr global_context_copy = Context::createCopy(global_context);
global_context_copy->setCurrentDatabase(current_database);
auto evaluated = evaluateConstantExpressionOrIdentifierAsLiteral(arg, global_context_copy);
const auto * literal = evaluated->as<ASTLiteral>();
if (!literal || (literal->value.getType() != Field::Types::String))
return {};
if (literal->value.getType() == Field::Types::String)
return literal->value.safeGet<String>();
}
catch (...)
{
}

if (!evaluate)
return {};

try
{
/// We're just searching for dependencies here, it's not safe to execute subqueries now.
/// Use copy of the global_context and set current database, because expressions can contain currentDatabase() function.
ContextMutablePtr global_context_copy = Context::createCopy(global_context);
global_context_copy->setCurrentDatabase(current_database);
auto evaluated = evaluateConstantExpressionOrIdentifierAsLiteral(arg, global_context_copy);
const auto * literal = evaluated->as<ASTLiteral>();
if (!literal || (literal->value.getType() != Field::Types::String))
return {};
}
return literal->value.safeGet<String>();
}
else
catch (...)
{
if (const auto * id = arg->as<ASTIdentifier>())
return id->name();
if (const auto * literal = arg->as<ASTLiteral>())
{
if (literal->value.getType() == Field::Types::String)
return literal->value.safeGet<String>();
}
return {};
}
}
Expand Down