fix errors in arcadia with 'uknown option login in create user'

commit_hash:c5befaca465358942992e4e07be0d853b834a9bf

4 files changed, 5 insertions, 14 deletions

diff --git a/yql/essentials/sql/v1/query.cpp b/yql/essentials/sql/v1/query.cpp
index b7914ec577..c74f96a27c 100644
--- a/yql/essentials/sql/v1/query.cpp
+++ b/yql/essentials/sql/v1/query.cpp
@@ -1936,9 +1936,8 @@ public:
             }
         }
 
-
         auto options = Y(Q(Y(Q("mode"), Q(IsUser ? "createUser" : "createGroup"))));
-        {
+        if (Params) {
             if (Params->IsPasswordEncrypted) {
                 options = L(options, Q(Y(Q("passwordEncrypted"))));
             }
diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp
index 947a6dc42f..ac2baf978b 100644
--- a/yql/essentials/sql/v1/sql_query.cpp
+++ b/yql/essentials/sql/v1/sql_query.cpp
@@ -614,9 +614,7 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
                     opts.push_back(opt.GetRule_create_user_option1());
                 }
 
-                bool isCreateUser = true;
-
-                if (!RoleParameters(opts, *roleParams, isCreateUser)) {
+                if (!RoleParameters(opts, *roleParams)) {
                     return false;
                 }
             }
@@ -659,9 +657,7 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
                         opts.push_back(opt.GetRule_create_user_option1());
                     }
 
-                    bool isCreateUser = false;
-
-                    if (!RoleParameters(opts, roleParams, isCreateUser)) {
+                    if (!RoleParameters(opts, roleParams)) {
                         return false;
                     }
                     stmt = BuildAlterUser(pos, service, cluster, roleName, roleParams, Ctx.Scoped);
diff --git a/yql/essentials/sql/v1/sql_translation.cpp b/yql/essentials/sql/v1/sql_translation.cpp
index 6c9b288f70..5dc95b3fcd 100644
--- a/yql/essentials/sql/v1/sql_translation.cpp
+++ b/yql/essentials/sql/v1/sql_translation.cpp
@@ -3818,7 +3818,7 @@ bool TSqlTranslation::RoleNameClause(const TRule_role_name& node, TDeferredAtom&
     return true;
 }
 
-bool TSqlTranslation::RoleParameters(const std::vector<TRule_create_user_option>& optionsList, TRoleParameters& result, bool isCreateUser) {
+bool TSqlTranslation::RoleParameters(const std::vector<TRule_create_user_option>& optionsList, TRoleParameters& result) {
     enum class ECreateUserOption {
         Login,
         Password
@@ -3886,10 +3886,6 @@ bool TSqlTranslation::RoleParameters(const std::vector<TRule_create_user_option>
 
     result = TRoleParameters{};
 
-    if (isCreateUser) {
-        result.CanLogin = TRoleParameters::ETypeOfLogin::Login;
-    }
-
     for (const auto& option : optionsList) {
         if (!ParseCreateUserOption(option, result)) {
             return false;
diff --git a/yql/essentials/sql/v1/sql_translation.h b/yql/essentials/sql/v1/sql_translation.h
index 3587b57a7a..75e9c2f7d4 100644
--- a/yql/essentials/sql/v1/sql_translation.h
+++ b/yql/essentials/sql/v1/sql_translation.h
@@ -242,7 +242,7 @@ protected:
     bool ParseResourcePoolClassifierSettings(std::map<TString, TDeferredAtom>& result, const TRule_with_table_settings& settings);
     bool ParseResourcePoolClassifierSettings(std::map<TString, TDeferredAtom>& result, std::set<TString>& toReset, const TRule_alter_resource_pool_classifier_action& alterAction);
     bool RoleNameClause(const TRule_role_name& node, TDeferredAtom& result, bool allowSystemRoles);
-    bool RoleParameters(const std::vector<TRule_create_user_option>& optionsList, TRoleParameters& result, bool isCreateUser);
+    bool RoleParameters(const std::vector<TRule_create_user_option>& optionsList, TRoleParameters& result);
     bool PermissionNameClause(const TRule_permission_name_target& node, TVector<TDeferredAtom>& result, bool withGrantOption);
     bool PermissionNameClause(const TRule_permission_name& node, TDeferredAtom& result);
     bool PermissionNameClause(const TRule_permission_id& node, TDeferredAtom& result);