From a21e6448ce7afb43fc56a06cf2d1ce2dbace6729 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 15 Jun 2020 17:10:25 +0530 Subject: [PATCH] Fixed RESQL test cases, regression of RLS policy. --- .../row_security_policies/tests/default/alter_policy.sql | 7 +++---- .../tests/default/alter_policy_msql.sql | 2 +- .../tests/default/create_insert_policy.sql | 7 +++---- .../tests/default/create_public_policy.sql | 7 +++---- .../tests/default/create_select_policy.sql | 7 +++---- .../tables/row_security_policies/tests/default/test.json | 2 +- .../row_security_policies/sql/9.5_plus/create.sql | 1 - 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy.sql index aa4c4093e..b4a3255fd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy.sql @@ -1,10 +1,9 @@ +-- POLICY: policy_1 ON public.test_rls_policy --- POLICY: policy_1 ON public.test_emp_rule - --- DROP POLICY policy_1 ON public.test_emp_rule; +-- DROP POLICY policy_1 ON public.test_rls_policy; CREATE POLICY policy_1 - ON public.test_emp_rule + ON public.test_rls_policy FOR ALL TO public ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy_msql.sql index 8614ff2c9..ae36ebff1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_policy_msql.sql @@ -1,2 +1,2 @@ -ALTER POLICY test ON public.test_emp_rule +ALTER POLICY test ON public.test_rls_policy RENAME TO policy_1; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_insert_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_insert_policy.sql index b130f3915..426245453 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_insert_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_insert_policy.sql @@ -1,10 +1,9 @@ +-- POLICY: insert_policy ON public.test_rls_policy --- POLICY: insert_policy ON public.test_emp_rule - --- DROP POLICY insert_policy ON public.test_emp_rule; +-- DROP POLICY insert_policy ON public.test_rls_policy; CREATE POLICY insert_policy - ON public.test_emp_rule + ON public.test_rls_policy FOR INSERT TO public ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_public_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_public_policy.sql index 6a3332e19..e16db9360 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_public_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_public_policy.sql @@ -1,10 +1,9 @@ +-- POLICY: test ON public.test_rls_policy --- POLICY: test ON public.test_emp_rule - --- DROP POLICY test ON public.test_emp_rule; +-- DROP POLICY test ON public.test_rls_policy; CREATE POLICY test - ON public.test_emp_rule + ON public.test_rls_policy FOR ALL TO public ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_select_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_select_policy.sql index d2f848e6b..616675170 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_select_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_select_policy.sql @@ -1,10 +1,9 @@ +-- POLICY: select_policy ON public.test_rls_policy --- POLICY: select_policy ON public.test_emp_rule - --- DROP POLICY select_policy ON public.test_emp_rule; +-- DROP POLICY select_policy ON public.test_rls_policy; CREATE POLICY select_policy - ON public.test_emp_rule + ON public.test_rls_policy FOR SELECT TO public ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/test.json index 67525eb1b..f57adc262 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/test.json @@ -6,7 +6,7 @@ "endpoint": "NODE-table.obj", "sql_endpoint": "NODE-table.sql_id", "data": { - "name": "test_emp_rule", + "name": "test_rls_policy", "columns": [ { "name": "emp_id", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/9.5_plus/create.sql index 42b893968..7186fc1de 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/9.5_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/row_security_policies/sql/9.5_plus/create.sql @@ -1,5 +1,4 @@ {# CREATE POLICY Statement #} - -- POLICY: {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} -- DROP POLICY {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }};