From a85861ca57c942f11cb04dc2a485a68ceddcf88e Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 16 Jan 2017 14:46:35 +0000 Subject: [PATCH] Remove some comments that don't fit with our normal presentation of generated SQL. --- .../servers/roles/templates/role/sql/post8_4/update.sql | 6 ------ .../servers/roles/templates/role/sql/post9_0/update.sql | 6 ------ .../servers/roles/templates/role/sql/post9_1/update.sql | 6 ------ .../servers/roles/templates/role/sql/post9_4/update.sql | 6 ------ 4 files changed, 24 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql index 22bf349b5..b1fd620a8 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql @@ -70,18 +70,12 @@ UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; data.revoked_admins|length > 0 %} --- Revoked the admin options from the members REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - --- Following are no more the members REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} --- Following are the new admins (or, existing members made admins) GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - --- Following are the new members GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %} {% if 'variables' in data and data.variables|length > 0 %} {% set variables = data.variables %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql index c72a6a9a9..263bb510a 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql @@ -67,18 +67,12 @@ UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; data.revoked_admins|length > 0 %} --- Revoked the admin options from the members REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - --- Following are no more the members REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} --- Following are the new admins (or, existing members made admins) GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - --- Following are the new members GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %} {% if 'variables' in data and data.variables|length > 0 %} {% set variables = data.variables %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql index d0a55d06e..5cfb3d540 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql @@ -72,18 +72,12 @@ UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; data.revoked_admins|length > 0 %} --- Revoked the admin options from the members REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - --- Following are no more the members REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} --- Following are the new admins (or, existing members made admins) GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - --- Following are the new members GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %}{% if data.seclabels and data.seclabels|length > 0 %}{% set seclabels = data.seclabels %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql index 09028e6d3..faa1c78c6 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql @@ -47,18 +47,12 @@ ALTER {% if rolCanLogin %}USER{% else %}ROLE{% endif %} {{ conn|qtIdent(rolname) data.revoked_admins|length > 0 %} --- Revoked the admin options from the members REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - --- Following are no more the members REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} --- Following are the new admins (or, existing members made admins) GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - --- Following are the new members GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %}{% if data.seclabels and data.seclabels|length > 0 %}{% set seclabels = data.seclabels %}