Merge pull request ClickHouse#54083 from ClickHouse/backport/23.7/54066

Backport ClickHouse#54066 to 23.7: Fix named_collection_admin alias
ClibMouse · Sep 30, 2023 · e197d71 · e197d71
2 parents c8b7686 + 70c3ce3
commit e197d71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
@@ -287,7 +287,7 @@ namespace
         }
 
         bool access_management = config.getBool(user_config + ".access_management", false);
-        bool named_collection_control = config.getBool(user_config + ".named_collection_control", false);
+        bool named_collection_control = config.getBool(user_config + ".named_collection_control", false) || config.getBool(user_config + ".named_collection_admin", false);
         bool show_named_collections_secrets = config.getBool(user_config + ".show_named_collections_secrets", false);
 
         if (grant_queries)

diff --git a/tests/integration/test_storage_s3/configs/users.xml b/tests/integration/test_storage_s3/configs/users.xml
@@ -3,7 +3,8 @@
         <default>
             <password></password>
             <profile>default</profile>
-            <named_collection_control>1</named_collection_control>
+            <named_collection_admin>1</named_collection_admin>
         </default>
     </users>
 </clickhouse>
+