thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

more changes

Browse Source
This commit is contained in:
Yatsishin Ilya 2024-08-05 14:43:28 +00:00
parent e57f5a90ea
commit 3e633ad0d0
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/test_access_control_on_cluster/test.py
View File

@ -89,3 +89,5 @@ def test_grant_current_database_on_cluster():
assert ch1.query("SHOW DATABASES", user="test_user") == "user_db\n"
ch1.query("GRANT SELECT ON * TO test_user ON CLUSTER 'cluster'", user="test_user")
assert ch1.query("SHOW DATABASES", user="test_user") == "user_db\n"
ch1.query("DROP DATABASE user_db ON CLUSTER 'cluster'")
ch1.query("DROP USER test_user ON CLUSTER 'cluster'")

11
tests/integration/test_access_for_functions/test.py
View File

@ -65,8 +65,8 @@ def test_ignore_obsolete_grant_on_database():
"-c",
f"""
cat > /var/lib/clickhouse/access/{user_id}.sql << EOF
ATTACH USER X;
ATTACH GRANT CREATE FUNCTION, SELECT ON mydb.* TO X;
ATTACH USER \`{user_id}\`;
ATTACH GRANT CREATE FUNCTION, SELECT ON mydb.* TO \`{user_id}\`;
EOF""",
]
)
@ -76,4 +76,9 @@ EOF""",
)
instance.start_clickhouse()
assert instance.query("SHOW GRANTS FOR X") == "GRANT SELECT ON mydb.* TO X\n"
assert (
instance.query(f"SHOW GRANTS FOR `{user_id}`")
== f"GRANT SELECT ON mydb.* TO `{user_id}`\n"
)
instance.stop_clickhouse()
instance.start_clickhouse()

1
tests/integration/test_alter_comment_on_cluster/test.py
View File

@ -59,3 +59,4 @@ def test_comment(started_cluster):
expected = "CREATE TABLE default.test_table (`id` Int64 COMMENT \\'column_comment_2\\') ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\') ORDER BY id SETTINGS index_granularity = 8192 COMMENT \\'table_comment_2\\'"
assert_create_query([node_1, node_2], "default", "test_table", expected)
node_1.query("DROP TABLE test_table ON CLUSTER 'cluster'")

14
tests/integration/test_alter_moving_garbage/test.py
View File

@ -36,6 +36,16 @@ def cluster():
cluster.shutdown()
def drop_table(node, table_name, replicated):
create_table_statement = f"DROP TABLE {table_name} SYNC"
if replicated:
node.query_with_retry(create_table_statement)
else:
node.query(create_table_statement)
def create_table(node, table_name, replicated, additional_settings):
settings = {
"storage_policy": "two_disks",
@ -158,6 +168,9 @@ def test_alter_moving(
assert data_digest == "1000\n"
for node in nodes:
drop_table(node, table_name, replicated_engine)
def test_delete_race_leftovers(cluster):
"""
@ -248,3 +261,4 @@ def test_delete_race_leftovers(cluster):
# Check that we have all data
assert table_digest == node.query(table_digest_query)
drop_table(node, table_name, replicated=True)

6
tests/integration/test_alter_on_mixed_type_cluster/test.py
View File

@ -88,6 +88,9 @@ def test_alter_on_cluter_non_replicated(started_cluster):
assert node3.query("SELECT COUNT() FROM test_table") == "2\n"
assert node4.query("SELECT COUNT() FROM test_table") == "2\n"
for node in [node1, node2, node3, node4]:
node.query("TRUNCATE TABLE test_table")
def test_alter_replicated_on_cluster(started_cluster):
for node in [node1, node3]:
@ -133,3 +136,6 @@ def test_alter_replicated_on_cluster(started_cluster):
assert node2.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
assert node3.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
assert node4.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
for node in [node1, node2, node3, node4]:
node.query("TRUNCATE TABLE test_table_replicated")