fix

ClickHouse · Apr 16, 2024 · 3e34eee · 3e34eee
1 parent a1e3a4a
commit 3e34eee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
@@ -205,7 +205,7 @@ namespace
         }
 
         /// There is overlap between AccessType sources and table engines, so the following code avoids user granting twice.
-        std::vector<std::tuple<AccessFlags, std::string>> source_and_table_engines = {
+        static const std::vector<std::tuple<AccessFlags, std::string>> source_and_table_engines = {
             {AccessType::FILE, "File"},
             {AccessType::URL, "URL"},
             {AccessType::REMOTE, "Distributed"},

diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
@@ -291,29 +291,19 @@ def test_allowed_databases(test_cluster):
     instance.query("CREATE DATABASE IF NOT EXISTS db2 ON CLUSTER cluster")
 
     instance.query(
-        "CREATE TABLE IF NOT EXISTS db1.t1 ON CLUSTER cluster (i Int8) ENGINE = Memory"
-    )
-    instance.query(
-        "CREATE TABLE IF NOT EXISTS db2.t2 ON CLUSTER cluster (i Int8) ENGINE = Memory"
-    )
-    instance.query(
-        "CREATE TABLE IF NOT EXISTS t3 ON CLUSTER cluster (i Int8) ENGINE = Memory"
-    )
-
-    instance.query(
-        "SELECT * FROM db1.t1",
+        "CREATE TABLE db1.t1 ON CLUSTER cluster (i Int8) ENGINE = Memory",
         settings={"user": "restricted_user"},
     )
 
     with pytest.raises(Exception):
         instance.query(
-            "SELECT * FROM db2.t2",
+            "CREATE TABLE db2.t2 ON CLUSTER cluster (i Int8) ENGINE = Memory",
             settings={"user": "restricted_user"},
         )
 
     with pytest.raises(Exception):
         instance.query(
-            "SELECT * FROM t3",
+            "CREATE TABLE t3 ON CLUSTER cluster (i Int8) ENGINE = Memory",
             settings={"user": "restricted_user"},
         )
 

diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
@@ -989,7 +989,6 @@ def test_predefined_connection_configuration(started_cluster):
     instance.query("GRANT CREATE ON *.* TO user")
     instance.query("GRANT SOURCES ON *.* TO user")
     instance.query("GRANT SELECT ON *.* TO user")
-    instance.query("GRANT TABLE ENGINE ON S3 TO user")
 
     instance.query(f"drop table if exists {name}", user="user")
     error = instance.query_and_get_error(

diff --git a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
@@ -9,9 +9,7 @@ ${CLICKHOUSE_CLIENT} -q "create table mute_stylecheck (x UInt32) engine = Replic
 
 ${CLICKHOUSE_CLIENT} -q "CREATE USER user_${CLICKHOUSE_DATABASE} settings database_replicated_allow_only_replicated_engine=1"
 ${CLICKHOUSE_CLIENT} -q "GRANT CREATE TABLE ON ${CLICKHOUSE_DATABASE}_db.* TO user_${CLICKHOUSE_DATABASE}"
-${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON Memory TO user_${CLICKHOUSE_DATABASE}"
-${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON MergeTree TO user_${CLICKHOUSE_DATABASE}"
-${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON ReplicatedMergeTree TO user_${CLICKHOUSE_DATABASE}"
+${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON Memory, TABLE ENGINE ON MergeTree, TABLE ENGINE ON ReplicatedMergeTree TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} --allow_experimental_database_replicated=1 --query "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine = Replicated('/clickhouse/databases/${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}_db', '{shard}', '{replica}')"
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_memory (x UInt32) engine = Memory;"
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"