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

Better formatting of CREATE queries

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-15 07:27:33 +03:00
parent 1c5c2f8c69
commit e9eb722d4a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Parsers/ASTCreateQuery.cpp
View File

@ -197,6 +197,7 @@ ASTPtr ASTCreateQuery::clone() const
void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
{
frame.need_parens = false;
frame.expression_list_always_start_on_new_line = true;
if (!database.empty() && table.empty())
{

6
src/Parsers/ASTExpressionList.cpp
View File

@ -39,10 +39,12 @@ void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, For
settings.ostr << separator;
}
if (children.size() > 1)
if (children.size() > 1 || frame.expression_list_always_start_on_new_line)
settings.ostr << indent_str;
(*it)->formatImpl(settings, state, frame);
FormatStateStacked frame_nested = frame;
frame_nested.expression_list_always_start_on_new_line = false;
(*it)->formatImpl(settings, state, frame_nested);
}
}

1
src/Parsers/IAST.h
View File

@ -202,6 +202,7 @@ public:
{
UInt8 indent = 0;
bool need_parens = false;
bool expression_list_always_start_on_new_line = false; /// Line feed and indent before expression list even if it's of single element.
const IAST * current_select = nullptr;
};