public inbox for [email protected]  

help / color / mirror / Atom feed

From: Murtuza Zabuawala <[email protected]>
To: Dave Page <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: [RM#4468] Add RE-SQL tests for Type node
Date: Mon, 15 Jul 2019 17:45:48 +0530
Message-ID: <CAKKotZSPVaqfy_iQKdYnbuN=MCyRVeLKAtxZZXS_utNawvXubA@mail.gmail.com> (raw)
In-Reply-To: <CA+OCxox=YJg1GP+Uo21zn7V5ryPyRHC9nqARwFttd6ZyAFKRXA@mail.gmail.com>
References: <CAKKotZSFwfZNhpkemShQJpSc2cQRF6-WkdPsgJ=6CvQGz6Oy4w@mail.gmail.com>
	<CA+OCxox=YJg1GP+Uo21zn7V5ryPyRHC9nqARwFttd6ZyAFKRXA@mail.gmail.com>

Hi Dave,

PFA patch to fix the ACL order so that it RE-SQL tests for type node works
consistently on all the platforms.

--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company



On Mon, Jul 15, 2019 at 2:55 PM Dave Page <[email protected]> wrote:

> Thanks, patch applied.
>
> On Mon, Jul 15, 2019 at 7:57 AM Murtuza Zabuawala <
> [email protected]> wrote:
>
>> Hi,
>>
>> Please find patch for RE-SQL type node.
>>
>> - Fixed a bug in update.sql which is found during writing tests
>> - Added logging for JSON file when it fails to load
>>
>>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>


Attachments:

  [application/octet-stream] fix_acl_order.diff (3.3K, 3-fix_acl_order.diff)
  download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
index 3491c7a5..83c1605a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql
@@ -24,3 +24,4 @@ FROM
     LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
     LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname
+ORDER BY grantee
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
index eb5c7747..4769bf1d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_composite_type_acl_description.sql
@@ -15,6 +15,6 @@ ALTER TYPE public."composite_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."composite_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
index fd619221..e114d0cf 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_enum_type_acl_description.sql
@@ -11,6 +11,6 @@ ALTER TYPE public."enum_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."enum_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
index 8f3d3f62..496f8422 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/default/alter_range_type_acl_description.sql
@@ -14,6 +14,6 @@ ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#"
 COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#"
     IS 'this is test';
 
-GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
-
 GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
+
+GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO <OWNER>;

view thread (4+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected]
  Subject: Re: [RM#4468] Add RE-SQL tests for Type node
  In-Reply-To: <CAKKotZSPVaqfy_iQKdYnbuN=MCyRVeLKAtxZZXS_utNawvXubA@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox