simplify formatting of astauth

arthurpassos · arthurpassos · commit 5a2b0ea1cc7e · 2024-07-05T16:08:10.000-03:00
diff --git a/src/Parsers/Access/ASTAuthenticationData.cpp b/src/Parsers/Access/ASTAuthenticationData.cpp
@@ -160,9 +160,7 @@ void ASTAuthenticationData::formatImpl(const FormatSettings & settings, FormatSt
             auth_type_name = AuthenticationTypeInfo::get(*type).name;
     }
 
-    const char * identified_string = settings.additional_authentication_method ? " ADD IDENTIFIED" : " IDENTIFIED";
-
-    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << identified_string << (settings.hilite ? IAST::hilite_none : "");
+    settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " IDENTIFIED" << (settings.hilite ? IAST::hilite_none : "");
 
     if (!auth_type_name.empty())
     {
diff --git a/src/Parsers/Access/ASTCreateUserQuery.cpp b/src/Parsers/Access/ASTCreateUserQuery.cpp
@@ -21,14 +21,16 @@ namespace
 
     void formatAuthenticationData(const std::vector<std::shared_ptr<ASTAuthenticationData>> & authentication_methods, const IAST::FormatSettings & settings)
     {
+        /*
+         * The first authentication method must be formatted in the form of: `IDENTIFIED WITH xyz..`
+         * The remaining ones shall contain the `ADD`: `ADD IDENTIFIED WITH`.
+         * */
         authentication_methods[0]->format(settings);
 
-        auto settings_with_additional_authentication_method = settings;
-        settings_with_additional_authentication_method.additional_authentication_method = true;
-
-        for (auto i = 1u; i < authentication_methods.size(); i++)
+        for (std::size_t i = 1; i < authentication_methods.size(); i++)
         {
-            authentication_methods[i]->format(settings_with_additional_authentication_method);
+            settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " ADD" << (settings.hilite ? IAST::hilite_none : "");
+            authentication_methods[i]->format(settings);
         }
     }
 
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
@@ -201,7 +201,6 @@ class IAST : public std::enable_shared_from_this<IAST>, public TypePromotion<IAS
         bool show_secrets; /// Show secret parts of the AST (e.g. passwords, encryption keys).
         char nl_or_ws; /// Newline or whitespace.
         LiteralEscapingStyle literal_escaping_style;
-        bool additional_authentication_method;
 
         explicit FormatSettings(
             WriteBuffer & ostr_,
@@ -210,8 +209,7 @@ class IAST : public std::enable_shared_from_this<IAST>, public TypePromotion<IAS
             bool always_quote_identifiers_ = false,
             IdentifierQuotingStyle identifier_quoting_style_ = IdentifierQuotingStyle::Backticks,
             bool show_secrets_ = true,
-            LiteralEscapingStyle literal_escaping_style_ = LiteralEscapingStyle::Regular,
-            bool additional_authentication_method_ = false)
+            LiteralEscapingStyle literal_escaping_style_ = LiteralEscapingStyle::Regular)
             : ostr(ostr_)
             , one_line(one_line_)
             , hilite(hilite_)
@@ -220,7 +218,6 @@ class IAST : public std::enable_shared_from_this<IAST>, public TypePromotion<IAS
             , show_secrets(show_secrets_)
             , nl_or_ws(one_line ? ' ' : '\n')
             , literal_escaping_style(literal_escaping_style_)
-            , additional_authentication_method(additional_authentication_method_)
         {
         }
 
@@ -233,7 +230,6 @@ class IAST : public std::enable_shared_from_this<IAST>, public TypePromotion<IAS
             , show_secrets(other.show_secrets)
             , nl_or_ws(other.nl_or_ws)
             , literal_escaping_style(other.literal_escaping_style)
-            , additional_authentication_method(other.additional_authentication_method)
         {
         }
 

Original file line number	Diff line number	Diff line change
`@@ -160,9 +160,7 @@ void ASTAuthenticationData::formatImpl(const FormatSettings & settings, FormatSt`
`160`	`160`	`auth_type_name = AuthenticationTypeInfo::get(*type).name;`
`161`	`161`	`}`
`162`	`162`
`163`		`- const char * identified_string = settings.additional_authentication_method ? " ADD IDENTIFIED" : " IDENTIFIED";`
`164`		`-`
`165`		`- settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << identified_string << (settings.hilite ? IAST::hilite_none : "");`
	`163`	`+ settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " IDENTIFIED" << (settings.hilite ? IAST::hilite_none : "");`
`166`	`164`
`167`	`165`	`if (!auth_type_name.empty())`
`168`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,16 @@ namespace`
`21`	`21`
`22`	`22`	`void formatAuthenticationData(const std::vector<std::shared_ptr<ASTAuthenticationData>> & authentication_methods, const IAST::FormatSettings & settings)`
`23`	`23`	`{`
	`24`	`+ /*`
	`25`	+ * The first authentication method must be formatted in the form of: `IDENTIFIED WITH xyz..`
	`26`	+ * The remaining ones shall contain the `ADD`: `ADD IDENTIFIED WITH`.
	`27`	`+ * */`
`24`	`28`	`authentication_methods[0]->format(settings);`
`25`	`29`
`26`		`- auto settings_with_additional_authentication_method = settings;`
`27`		`- settings_with_additional_authentication_method.additional_authentication_method = true;`
`28`		`-`
`29`		`- for (auto i = 1u; i < authentication_methods.size(); i++)`
	`30`	`+ for (std::size_t i = 1; i < authentication_methods.size(); i++)`
`30`	`31`	`{`
`31`		`- authentication_methods[i]->format(settings_with_additional_authentication_method);`
	`32`	`+ settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << " ADD" << (settings.hilite ? IAST::hilite_none : "");`
	`33`	`+ authentication_methods[i]->format(settings);`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`