open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force COLLATE "C" to stabilize ordering in new test_pg_dump queries.

Browse Source 
Should have thought of the need for this.

(Local testing suggests that we may still not be out of the
woods, but certainly this much is needed.)

Per buildfarm and David Rowley.

Discussion: https://postgr.es/m/CAApHDvo8pMk5WWFAqwGzuQ-Xh+957W61io_OsCP0oUzqCCODTg@mail.gmail.com
pull/160/head
Tom Lane 1 year ago
parent 9d9ece4c16
commit 900d114425
2 changed files with 4 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/test/modules/test_pg_dump/expected/test_pg_dump.out
  2. 4
      src/test/modules/test_pg_dump/sql/test_pg_dump.sql

4
src/test/modules/test_pg_dump/expected/test_pg_dump.out
Unescape View File

@ -70,7 +70,7 @@ SELECT s.obj,
ELSE a.grantee::regrole::name END, ELSE a.grantee::regrole::name END,
a.privilege_type, a.is_grantable a.privilege_type, a.is_grantable
FROM FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s, FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
aclexplode(s.initprivs) a; aclexplode(s.initprivs) a;
obj | grantor | grantee | privilege_type | is_grantable obj | grantor | grantee | privilege_type | is_grantable
@ -207,7 +207,7 @@ SELECT s.obj,
ELSE a.grantee::regrole::name END, ELSE a.grantee::regrole::name END,
a.privilege_type, a.is_grantable a.privilege_type, a.is_grantable
FROM FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s, FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
aclexplode(s.initprivs) a; aclexplode(s.initprivs) a;
obj | grantor | grantee | privilege_type | is_grantable obj | grantor | grantee | privilege_type | is_grantable

4
src/test/modules/test_pg_dump/sql/test_pg_dump.sql
Unescape View File

@ -83,7 +83,7 @@ SELECT s.obj,
ELSE a.grantee::regrole::name END, ELSE a.grantee::regrole::name END,
a.privilege_type, a.is_grantable a.privilege_type, a.is_grantable
FROM FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s, FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
aclexplode(s.initprivs) a; aclexplode(s.initprivs) a;
SELECT pg_describe_object(classid,objid,objsubid) AS obj, SELECT pg_describe_object(classid,objid,objsubid) AS obj,
@ -135,7 +135,7 @@ SELECT s.obj,
ELSE a.grantee::regrole::name END, ELSE a.grantee::regrole::name END,
a.privilege_type, a.is_grantable a.privilege_type, a.is_grantable
FROM FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs (SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s, FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
aclexplode(s.initprivs) a; aclexplode(s.initprivs) a;
SELECT pg_describe_object(classid,objid,objsubid) AS obj, SELECT pg_describe_object(classid,objid,objsubid) AS obj,

Write Preview
Loading…
Cancel
Save