File 0006-Fix-the-RE-SQL-syntax-for-roles-with-a-VALID-UNTIL-clause.patch of Package pgadmin4.16330
From 2e3475e06acdab77984508d954474353895e4d2e Mon Sep 17 00:00:00 2001 From: Dave Page <dpage@pgadmin.org> Date: Fri, 15 Mar 2019 10:03:11 +0000 Subject: [PATCH] Fix the RE-SQL syntax for roles with a VALID UNTIL clause. Fixes #4081 --- docs/en_US/release_notes_4_4.rst | 3 ++- .../servers/roles/templates/role/sql/post8_4/sql.sql | 2 +- .../servers/roles/templates/role/sql/post9_0/sql.sql | 2 +- .../servers/roles/templates/role/sql/post9_1/sql.sql | 2 +- .../servers/roles/templates/role/sql/post9_4/sql.sql | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) #diff --git a/docs/en_US/release_notes_4_4.rst b/docs/en_US/release_notes_4_4.rst #index c40162973e..d718632b06 100644 #--- a/docs/en_US/release_notes_4_4.rst #+++ b/docs/en_US/release_notes_4_4.rst #@@ -28,4 +28,5 @@ Bug fixes # | `Bug #4060 <https://redmine.postgresql.org/issues/4060>`_ - Fix the latexpdf doc build. # | `Bug #4069 <https://redmine.postgresql.org/issues/4069>`_ - Append the file suffix to filenames when needed in the File Create dialogue. # | `Bug #4071 <https://redmine.postgresql.org/issues/4071>`_ - Ensure that Firefox prompts for a filename/location when downloading query results as a CSV file. #-| `Bug #4073 <https://redmine.postgresql.org/issues/4073>`_ - Change the CodeMirror active line background colour to $color-danger-lighter so it doesn't conflict with the selection colour. #\ No newline at end of file #+| `Bug #4073 <https://redmine.postgresql.org/issues/4073>`_ - Change the CodeMirror active line background colour to $color-danger-lighter so it doesn't conflict with the selection colour. #+| `Bug #4081 <https://redmine.postgresql.org/issues/4081>`_ - Fix the RE-SQL syntax for roles with a VALID UNTIL clause. #\ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql index d3cb081bbf..97653efb4f 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql @@ -15,7 +15,7 @@ FROM CASE WHEN rolcreatedb THEN 'CREATEDB' ELSE 'NOCREATEDB' END || E'\n ' || CASE WHEN rolcreaterole THEN 'CREATEROLE' ELSE 'NOCREATEROLE' END || E'\n ' || CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE ';' END || + CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' || -- PostgreSQL < 9.5 CASE WHEN rolsuper AND NOT rolcatupdate THEN E'\n\nUPDATE pg_authid SET rolcatupdate=false WHERE rolname=' || pg_catalog.quote_literal(rolname) || ';' ELSE '' END AS sql FROM diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql index db3d65c402..e3b561ef42 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql @@ -15,7 +15,7 @@ FROM CASE WHEN rolcreatedb THEN 'CREATEDB' ELSE 'NOCREATEDB' END || E'\n ' || CASE WHEN rolcreaterole THEN 'CREATEROLE' ELSE 'NOCREATEROLE' END || E'\n ' || CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE ';' END || + CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' || -- PostgreSQL < 9.5 CASE WHEN rolsuper AND NOT rolcatupdate THEN E'\n\nUPDATE pg_authid SET rolcatupdate=false WHERE rolname=' || pg_catalog.quote_literal(rolname) || ';' ELSE '' END AS sql FROM diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql index 8427bf573d..28d8f68d44 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql @@ -17,7 +17,7 @@ FROM -- PostgreSQL >= 9.1 CASE WHEN rolreplication THEN 'REPLICATION' ELSE 'NOREPLICATION' END || CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE ';' END || + CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' || -- PostgreSQL < 9.5 CASE WHEN rolsuper AND NOT rolcatupdate THEN E'\n\nUPDATE pg_authid SET rolcatupdate=false WHERE rolname=' || pg_catalog.quote_literal(rolname) || ';' ELSE '' END AS sql FROM diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql index fcd1d1ec5f..8cbc8117d8 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql @@ -17,7 +17,7 @@ FROM -- PostgreSQL >= 9.1 CASE WHEN rolreplication THEN 'REPLICATION' ELSE 'NOREPLICATION' END || CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE ';' END AS sql + CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' AS sql FROM pg_roles r WHERE
