From 296ad9163c695ed6df38793bdd3fa571b992f35d Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Wed, 23 Jan 2019 12:10:52 +0300 Subject: [PATCH] fix --- dbms/src/Parsers/ASTCreateQuery.h | 7 ++++--- dbms/src/Parsers/ParserCreateQuery.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dbms/src/Parsers/ASTCreateQuery.h b/dbms/src/Parsers/ASTCreateQuery.h index 9315cd17761..a062e5a596c 100644 --- a/dbms/src/Parsers/ASTCreateQuery.h +++ b/dbms/src/Parsers/ASTCreateQuery.h @@ -119,10 +119,11 @@ private: s.ostr << s.nl_or_ws << indent_str; s.ostr << (s.hilite ? hilite_keyword : "") << prefix << (s.hilite ? hilite_none : ""); - FormatStateStacked frame_nested = frame; - ++frame_nested.indent; + FormatSettings nested_settings = s; + nested_settings.one_line = true; + nested_settings.nl_or_ws = ' '; - elem->formatImpl(s, state, frame_nested); + elem->formatImpl(nested_settings, state, frame); } }; public: diff --git a/dbms/src/Parsers/ParserCreateQuery.cpp b/dbms/src/Parsers/ParserCreateQuery.cpp index b9c37a9c43f..66083ae5fab 100644 --- a/dbms/src/Parsers/ParserCreateQuery.cpp +++ b/dbms/src/Parsers/ParserCreateQuery.cpp @@ -179,9 +179,9 @@ bool ParserColumnsOrIndicesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, for (const auto & elem : list->children) { - if (dynamic_cast(elem.get())) + if (typeid_cast(elem.get())) columns->children.push_back(elem); - else if (dynamic_cast(elem.get())) + else if (typeid_cast(elem.get())) indices->children.push_back(elem); else return false;