From b91f6f0f5c3c7b45223dedaca020f2fec76dafa6 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Fri, 26 Jun 2020 19:24:54 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20the=20semicolon=20?= =?UTF-8?q?is=20misplaced=20in=20RLS=20Policy=20SQL.=20Fixed=20one=20regre?= =?UTF-8?q?ssion=20issue=20introduced=20by=20renaming=20the=20method=20'gc?= =?UTF-8?q?'=20to=20'gc=5Ftimeout'.=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/default/alter_policy.sql | 3 +-- .../tests/default/create_insert_policy.sql | 3 +-- .../tests/default/create_public_policy.sql | 3 +-- .../tests/default/create_select_policy.sql | 3 +-- .../sql/9.5_plus/create.sql | 18 +++++++++++++----- web/pgadmin/utils/driver/__init__.py | 2 +- 6 files changed, 18 insertions(+), 14 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 b4a3255fd..0e84ffe86 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 @@ -5,6 +5,5 @@ CREATE POLICY policy_1 ON public.test_rls_policy FOR ALL - TO public -; + TO public; 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 426245453..16613e697 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 @@ -5,6 +5,5 @@ CREATE POLICY insert_policy ON public.test_rls_policy FOR INSERT - TO public -; + 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 e16db9360..9a3308e0c 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 @@ -5,6 +5,5 @@ CREATE POLICY test ON public.test_rls_policy FOR ALL - TO public -; + 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 616675170..1b782fe39 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 @@ -5,6 +5,5 @@ CREATE POLICY select_policy ON public.test_rls_policy FOR SELECT - TO public -; + TO public; 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 b77f62c78..f5eb4d647 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 @@ -2,6 +2,12 @@ -- 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) }}; +{% set add_semicolon_after = 'to' %} +{% if data.withcheck is defined and data.withcheck != None and data.withcheck != '' %} +{% set add_semicolon_after = 'with_check' %} +{% elif data.using is defined and data.using != None and data.using != '' %} +{% set add_semicolon_after = 'using' %} +{% endif %} CREATE POLICY {{ conn|qtIdent(data.name) }} ON {{conn|qtIdent(data.schema, data.table)}} @@ -9,13 +15,15 @@ CREATE POLICY {{ conn|qtIdent(data.name) }} FOR {{ data.event|upper }} {% endif %} {% if data.policyowner %} - TO {{ conn|qtTypeIdent(data.policyowner) }} + TO {{ conn|qtTypeIdent(data.policyowner) }}{% if add_semicolon_after == 'to' %};{% endif %} {% else %} - TO public + TO public{% if add_semicolon_after == 'to' %};{% endif %} {% endif %} {% if data.using %} - USING ({{ data.using }}) + + USING ({{ data.using }}){% if add_semicolon_after == 'using' %};{% endif %} {% endif %} {% if data.withcheck %} - WITH CHECK ({{ data.withcheck }}) -{% endif %}; + + WITH CHECK ({{ data.withcheck }}); +{% endif %} diff --git a/web/pgadmin/utils/driver/__init__.py b/web/pgadmin/utils/driver/__init__.py index ad1e86a39..19d806df7 100644 --- a/web/pgadmin/utils/driver/__init__.py +++ b/web/pgadmin/utils/driver/__init__.py @@ -46,4 +46,4 @@ def ping(): drivers = getattr(current_app, '_pgadmin_server_drivers', None) for type in drivers: - drivers[type].gc() + drivers[type].gc_timeout()