thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-grammarly' of github.com:ClickHouse/ClickHouse into fix-grammarly

Browse Source
This commit is contained in:
Alexey Milovidov 2023-08-06 16:28:08 +02:00
commit 3f9e6bb2f0
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/test_backup_restore_on_cluster/test.py
View File

@ -626,7 +626,9 @@ def test_system_users():
node1.query("GRANT CREATE USER ON *.* TO u2") node1.query("GRANT CREATE USER ON *.* TO u2")
expected_error = "necessary to have the grant SELECT ON default.tbl WITH GRANT OPTION" expected_error = (
"necessary to have the grant SELECT ON default.tbl WITH GRANT OPTION"
)
assert expected_error in node1.query_and_get_error( assert expected_error in node1.query_and_get_error(
f"RESTORE TABLE system.users ON CLUSTER 'cluster' FROM {backup_name}", user="u2" f"RESTORE TABLE system.users ON CLUSTER 'cluster' FROM {backup_name}", user="u2"
) )

36
tests/integration/test_row_policy/test.py
View File

@ -636,7 +636,9 @@ def test_grant_create_row_policy():
assert node.query("SHOW POLICIES") == "" assert node.query("SHOW POLICIES") == ""
node.query("CREATE USER X") node.query("CREATE USER X")
expected_error = "necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X" "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X"
) )
@ -644,12 +646,16 @@ def test_grant_create_row_policy():
node.query( node.query(
"CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X" "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X"
) )
expected_error = "necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table2" expected_error = (
"necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table2"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"CREATE POLICY pA ON mydb.filtered_table2 FOR SELECT USING a<b", user="X" "CREATE POLICY pA ON mydb.filtered_table2 FOR SELECT USING a<b", user="X"
) )
expected_error = "necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X" "ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X"
) )
@ -657,25 +663,33 @@ def test_grant_create_row_policy():
node.query( node.query(
"ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X" "ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X"
) )
expected_error = "necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table2" expected_error = (
"necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table2"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"ALTER POLICY pA ON mydb.filtered_table2 FOR SELECT USING a==b", user="X" "ALTER POLICY pA ON mydb.filtered_table2 FOR SELECT USING a==b", user="X"
) )
expected_error = "necessary to have the grant DROP ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant DROP ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"DROP POLICY pA ON mydb.filtered_table1", user="X" "DROP POLICY pA ON mydb.filtered_table1", user="X"
) )
node.query("GRANT DROP POLICY ON mydb.filtered_table1 TO X") node.query("GRANT DROP POLICY ON mydb.filtered_table1 TO X")
node.query("DROP POLICY pA ON mydb.filtered_table1", user="X") node.query("DROP POLICY pA ON mydb.filtered_table1", user="X")
expected_error = "necessary to have the grant DROP ROW POLICY ON mydb.filtered_table2" expected_error = (
"necessary to have the grant DROP ROW POLICY ON mydb.filtered_table2"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"DROP POLICY pA ON mydb.filtered_table2", user="X" "DROP POLICY pA ON mydb.filtered_table2", user="X"
) )
node.query("REVOKE ALL ON *.* FROM X") node.query("REVOKE ALL ON *.* FROM X")
expected_error = "necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant CREATE ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X" "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X"
) )
@ -684,7 +698,9 @@ def test_grant_create_row_policy():
"CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X" "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b", user="X"
) )
expected_error = "necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant ALTER ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X" "ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X"
) )
@ -693,7 +709,9 @@ def test_grant_create_row_policy():
"ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X" "ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a==b", user="X"
) )
expected_error = "necessary to have the grant DROP ROW POLICY ON mydb.filtered_table1" expected_error = (
"necessary to have the grant DROP ROW POLICY ON mydb.filtered_table1"
)
assert expected_error in node.query_and_get_error( assert expected_error in node.query_and_get_error(
"DROP POLICY pA ON mydb.filtered_table1", user="X" "DROP POLICY pA ON mydb.filtered_table1", user="X"
) )