Merge branch 'master' into fix_status_newline_in_fasttest

This commit is contained in:
alesapin 2021-01-28 12:07:48 +03:00
commit 11a6d8e145
2 changed files with 9 additions and 2 deletions

View File

@ -43,6 +43,7 @@ RUN apt-get update \
clang-tidy-${LLVM_VERSION} \
cmake \
curl \
lsof \
expect \
fakeroot \
git \

View File

@ -693,12 +693,18 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
if (storage)
{
ss << ", maybe you meant: ";
String hint_name{};
for (const auto & name : columns_context.requiredColumns())
{
auto hints = storage->getHints(name);
if (!hints.empty())
ss << " '" << toString(hints) << "'";
hint_name = hint_name + " '" + toString(hints) + "'";
}
if (!hint_name.empty())
{
ss << ", maybe you meant: ";
ss << hint_name;
}
}
else