Merge pull request #728 from Altinity/fixes/ast_formatting_after_merge_hiccup

Antalya: Fixed AST formatting hiccups that occured during merge

Author: Enmk

src/Parsers/ASTCreateQuery.cpp

@@ -484,15 +484,6 @@ void ASTCreateQuery::formatQueryImpl(WriteBuffer & ostr, const FormatSettings &
 
     frame.expression_list_always_start_on_new_line = true;
 
-    if (is_ordinary_view && aliases_list && !as_table_function)
-    {
-        ostr << (settings.one_line ? " (" : "\n(");
-        aliases_list->format(ostr, settings, state, frame);
-        ostr << (settings.one_line ? ")" : "\n)");
-    }
-
-    frame.expression_list_always_start_on_new_line = true;
-
     if (is_ordinary_view && aliases_list && !as_table_function)
     {
         ostr << (settings.one_line ? " (" : "\n(");

src/Parsers/ASTSelectQuery.cpp

@@ -100,18 +100,6 @@ void ASTSelectQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & s, Fo
         frame.expression_list_prepend_whitespace = prep_whitespace;
     }
 
-    if (aliases())
-    {
-        const bool prep_whitespace = frame.expression_list_prepend_whitespace;
-        frame.expression_list_prepend_whitespace = false;
-
-        ostr << (s.hilite ? hilite_none : "") << indent_str << " (";
-        aliases()->format(ostr, s, state, frame);
-        ostr << (s.hilite ? hilite_none : "") << indent_str << ")";
-
-        frame.expression_list_prepend_whitespace = prep_whitespace;
-    }
-
     if (prewhere())
     {
         ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "PREWHERE " << (s.hilite ? hilite_none : "");