Moved more code to .cpp

dbms/src/Parsers/ASTColumnDeclaration.cpp

+#include <Parsers/ASTColumnDeclaration.h>
+
+
+namespace DB
+{
+
+ASTPtr ASTColumnDeclaration::clone() const
+{
+    const auto res = std::make_shared<ASTColumnDeclaration>(*this);
+    res->children.clear();
+
+    if (type)
+    {
+        res->type = type;
+        res->children.push_back(res->type);
+    }
+
+    if (default_expression)
+    {
+        res->default_expression = default_expression->clone();
+        res->children.push_back(res->default_expression);
+    }
+
+    if (codec)
+    {
+        res->codec = codec->clone();
+        res->children.push_back(res->codec);
+    }
+
+    if (comment)
+    {
+        res->comment = comment->clone();
+        res->children.push_back(res->comment);
+    }
+
+    return res;
+}
+
+void ASTColumnDeclaration::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    frame.need_parens = false;
+    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
+
+    settings.ostr << settings.nl_or_ws << indent_str << backQuoteIfNeed(name);
+    if (type)
+    {
+        settings.ostr << ' ';
+        type->formatImpl(settings, state, frame);
+    }
+
+    if (default_expression)
+    {
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << default_specifier << (settings.hilite ? hilite_none : "") << ' ';
+        default_expression->formatImpl(settings, state, frame);
+    }
+
+    if (comment)
+    {
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "COMMENT" << (settings.hilite ? hilite_none : "") << ' ';
+        comment->formatImpl(settings, state, frame);
+    }
+
+    if (codec)
+    {
+        settings.ostr << ' ';
+        codec->formatImpl(settings, state, frame);
+    }
+}
+
+}

dbms/src/Parsers/ASTColumnDeclaration.h

@@ -20,68 +20,8 @@ public:
 
     String getID(char delim) const override { return "ColumnDeclaration" + (delim + name); }
 
-    ASTPtr clone() const override
-    {
-        const auto res = std::make_shared<ASTColumnDeclaration>(*this);
-        res->children.clear();
-
-        if (type)
-        {
-            res->type = type;
-            res->children.push_back(res->type);
-        }
-
-        if (default_expression)
-        {
-            res->default_expression = default_expression->clone();
-            res->children.push_back(res->default_expression);
-        }
-
-        if (codec)
-        {
-            res->codec = codec->clone();
-            res->children.push_back(res->codec);
-        }
-
-        if (comment)
-        {
-            res->comment = comment->clone();
-            res->children.push_back(res->comment);
-        }
-
-        return res;
-    }
-
-    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
-    {
-        frame.need_parens = false;
-        std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
-
-        settings.ostr << settings.nl_or_ws << indent_str << backQuoteIfNeed(name);
-        if (type)
-        {
-            settings.ostr << ' ';
-            type->formatImpl(settings, state, frame);
-        }
-
-        if (default_expression)
-        {
-            settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << default_specifier << (settings.hilite ? hilite_none : "") << ' ';
-            default_expression->formatImpl(settings, state, frame);
-        }
-
-        if (comment)
-        {
-            settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "COMMENT" << (settings.hilite ? hilite_none : "") << ' ';
-            comment->formatImpl(settings, state, frame);
-        }
-
-        if (codec)
-        {
-            settings.ostr << ' ';
-            codec->formatImpl(settings, state, frame);
-        }
-    }
+    ASTPtr clone() const override;
+    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
 };
 
 }

dbms/src/Parsers/ASTCreateQuery.cpp

@@ -66,6 +66,19 @@ void ASTStorage::formatImpl(const FormatSettings & s, FormatState & state, Forma
 }
 
 
+class ASTColumnsElement : public IAST
+{
+public:
+    String prefix;
+    IAST * elem;
+
+    String getID(char c) const override { return "ASTColumnsElement for " + elem->getID(c); }
+
+    ASTPtr clone() const override;
+
+    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+};
+
 ASTPtr ASTColumnsElement::clone() const
 {
     auto res = std::make_shared<ASTColumnsElement>();
@@ -117,6 +130,7 @@ void ASTColumns::formatImpl(const FormatSettings & s, FormatState & state, Forma
     ASTExpressionList list;
 
     if (columns)
+    {
         for (const auto & column : columns->children)
         {
             auto elem = std::make_shared<ASTColumnsElement>();
@@ -124,7 +138,9 @@ void ASTColumns::formatImpl(const FormatSettings & s, FormatState & state, Forma
             elem->set(elem->elem, column->clone());
             list.children.push_back(elem);
         }
+    }
     if (indices)
+    {
         for (const auto & index : indices->children)
         {
             auto elem = std::make_shared<ASTColumnsElement>();
@@ -132,6 +148,7 @@ void ASTColumns::formatImpl(const FormatSettings & s, FormatState & state, Forma
             elem->set(elem->elem, index->clone());
             list.children.push_back(elem);
         }
+    }
 
     if (!list.children.empty())
         list.formatImpl(s, state, frame);

dbms/src/Parsers/ASTCreateQuery.h

@@ -28,20 +28,6 @@ public:
 };
 
 
-class ASTColumnsElement : public IAST
-{
-public:
-    String prefix;
-    IAST * elem;
-
-    String getID(char c) const override { return "ASTColumnsElement for " + elem->getID(c); }
-
-    ASTPtr clone() const override;
-
-    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
-};
-
-
 class ASTExpressionList;
 
 class ASTColumns : public IAST