thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Alexey Milovidov 2024-08-18 05:56:27 +02:00
parent 3c021e02b6
commit 60dd7e962a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/format/Format.cpp
View File

@ -264,10 +264,10 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
if (!backslash) if (!backslash)
{ {
WriteBufferFromOwnString str_buf; WriteBufferFromOwnString str_buf;
oneline = oneline || approx_query_length < max_line_length; bool oneline_current_query = oneline || approx_query_length < max_line_length;
IAST::FormatSettings settings(str_buf, oneline, hilite); IAST::FormatSettings settings(str_buf, oneline_current_query, hilite);
settings.show_secrets = true; settings.show_secrets = true;
settings.print_pretty_type_names = !oneline; settings.print_pretty_type_names = !oneline_current_query;
res->format(settings); res->format(settings);
if (insert_query_payload) if (insert_query_payload)
@ -311,7 +311,11 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
else else
{ {
WriteBufferFromOwnString str_buf; WriteBufferFromOwnString str_buf;
formatAST(*res, str_buf, hilite, oneline); bool oneline_current_query = oneline || approx_query_length < max_line_length;
IAST::FormatSettings settings(str_buf, oneline_current_query, hilite);
settings.show_secrets = true;
settings.print_pretty_type_names = !oneline_current_query;
res->format(settings);
auto res_string = str_buf.str(); auto res_string = str_buf.str();
WriteBufferFromOStream res_cout(std::cout, 4096); WriteBufferFromOStream res_cout(std::cout, 4096);