Sad changes

Author: pufit

src/Access/Common/AccessFlags.cpp

@@ -103,6 +103,7 @@ namespace
         const Flags & getDictionaryFlags() const { return all_flags_for_target[DICTIONARY]; }
         const Flags & getTableEngineFlags() const { return all_flags_for_target[TABLE_ENGINE]; }
         const Flags & getUserNameFlags() const { return all_flags_for_target[USER_NAME]; }
+        const Flags & getDefinerFlags() const { return all_flags_for_target[DEFINER]; }
         const Flags & getNamedCollectionFlags() const { return all_flags_for_target[NAMED_COLLECTION]; }
         const Flags & getAllFlagsGrantableOnGlobalLevel() const { return getAllFlags(); }
         const Flags & getAllFlagsGrantableOnGlobalWithParameterLevel() const { return getGlobalWithParameterFlags(); }
@@ -124,6 +125,7 @@ namespace
             NAMED_COLLECTION = 5,
             USER_NAME = 6,
             TABLE_ENGINE = 7,
+            DEFINER = 8,
         };
 
         struct Node;
@@ -353,7 +355,7 @@ namespace
         std::unordered_map<std::string_view, Flags> keyword_to_flags_map;
         std::vector<Flags> access_type_to_flags_mapping;
         Flags all_flags;
-        Flags all_flags_for_target[static_cast<size_t>(TABLE_ENGINE) + 1];
+        Flags all_flags_for_target[static_cast<size_t>(DEFINER) + 1];
         Flags all_flags_grantable_on_database_level;
         Flags all_flags_grantable_on_table_level;
         Flags all_flags_grantable_on_global_with_parameter_level;
@@ -400,6 +402,9 @@ AccessFlags::ParameterType AccessFlags::getParameterType() const
     if (AccessFlags::allUserNameFlags().contains(*this))
         return AccessFlags::USER_NAME;
 
+    if (AccessFlags::allDefinerFlags().contains(*this))
+        return AccessFlags::DEFINER;
+
     /// All flags refer to TABLE ENGINE access type.
     if (AccessFlags::allTableEngineFlags().contains(*this))
         return AccessFlags::TABLE_ENGINE;
@@ -423,6 +428,7 @@ AccessFlags AccessFlags::allColumnFlags() { return Helper::instance().getColumnF
 AccessFlags AccessFlags::allDictionaryFlags() { return Helper::instance().getDictionaryFlags(); }
 AccessFlags AccessFlags::allNamedCollectionFlags() { return Helper::instance().getNamedCollectionFlags(); }
 AccessFlags AccessFlags::allUserNameFlags() { return Helper::instance().getUserNameFlags(); }
+AccessFlags AccessFlags::allDefinerFlags() { return Helper::instance().getDefinerFlags(); }
 AccessFlags AccessFlags::allTableEngineFlags() { return Helper::instance().getTableEngineFlags(); }
 AccessFlags AccessFlags::allFlagsGrantableOnGlobalLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalWithParameterLevel(); }

src/Access/Common/AccessFlags.h

@@ -59,6 +59,7 @@ class AccessFlags
         TABLE_ENGINE,
         NAMED_COLLECTION,
         USER_NAME,
+        DEFINER,
     };
     ParameterType getParameterType() const;
     std::unordered_map<ParameterType, AccessFlags> splitIntoParameterTypes() const;
@@ -108,6 +109,9 @@ class AccessFlags
     /// Returns all the flags related to a user.
     static AccessFlags allUserNameFlags();
 
+    /// Returns all the flags related to a definer.
+    static AccessFlags allDefinerFlags();
+
     /// Returns all the flags related to a table engine.
     static AccessFlags allTableEngineFlags();
 

src/Access/Common/AccessRightsElement.cpp

@@ -156,7 +156,6 @@ void AccessRightsElement::formatONClause(WriteBuffer & buffer, bool hilite) cons
         /// If `enable_user_name_access_type` is set to false, we will dump `GRANT CREATE USER ON *` as `GRANT CREATE USER ON *.*`.
         /// This will allow us to run old replicas in the same cluster.
         if (access_flags.getParameterType() == AccessFlags::USER_NAME
-            && access_flags != AccessType::SET_DEFINER
             && !is_enabled_user_name_access_type)
         {
             if (!anyParameter())

src/Access/Common/AccessType.h

@@ -159,7 +159,7 @@ enum class AccessType : uint8_t
     M(SHOW_NAMED_COLLECTIONS_SECRETS, "SHOW NAMED COLLECTIONS SECRETS", NAMED_COLLECTION, NAMED_COLLECTION_ADMIN) \
     M(NAMED_COLLECTION, "NAMED COLLECTION USAGE, USE NAMED COLLECTION", NAMED_COLLECTION, NAMED_COLLECTION_ADMIN) \
     M(NAMED_COLLECTION_ADMIN, "NAMED COLLECTION CONTROL", NAMED_COLLECTION, ALL) \
-    M(SET_DEFINER, "", USER_NAME, ALL) \
+    M(SET_DEFINER, "", DEFINER, ALL) \
     \
     M(TABLE_ENGINE, "TABLE ENGINE", TABLE_ENGINE, ALL) \
     \

tests/integration/test_enable_user_name_access_type/test.py

@@ -1,7 +1,7 @@
 from helpers.cluster import ClickHouseCluster
 
 
-def test_startup_scripts():
+def test_enable_username_access_type():
     cluster = ClickHouseCluster(__file__)
 
     node = cluster.add_instance(