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, redux.

Browse Source 
David Rowley correctly pointed out that I'd collat-ified only
one of the two troublesome queries.  Definitely not my day.

Discussion: https://postgr.es/m/CAApHDvo8pMk5WWFAqwGzuQ-Xh+957W61io_OsCP0oUzqCCODTg@mail.gmail.com
pull/160/head
Tom Lane 1 year ago
parent 900d114425
commit b7dc5da196
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

@ -135,7 +135,7 @@ FROM
type regress_pg_dump_schema.test_type | postgres | regress_dump_test_role | USAGE | f type regress_pg_dump_schema.test_type | postgres | regress_dump_test_role | USAGE | f
(58 rows) (58 rows)
SELECT pg_describe_object(classid,objid,objsubid) AS obj, SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
pg_describe_object(refclassid,refobjid,0) AS refobj, pg_describe_object(refclassid,refobjid,0) AS refobj,
deptype deptype
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
@ -265,7 +265,7 @@ FROM
type regress_pg_dump_schema.test_type | postgres | postgres | USAGE | f type regress_pg_dump_schema.test_type | postgres | postgres | USAGE | f
(51 rows) (51 rows)
SELECT pg_describe_object(classid,objid,objsubid) AS obj, SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
pg_describe_object(refclassid,refobjid,0) AS refobj, pg_describe_object(refclassid,refobjid,0) AS refobj,
deptype deptype
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid FROM pg_shdepend JOIN pg_database d ON dbid = d.oid

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

@ -86,7 +86,7 @@ FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" 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) COLLATE "C" AS obj,
pg_describe_object(refclassid,refobjid,0) AS refobj, pg_describe_object(refclassid,refobjid,0) AS refobj,
deptype deptype
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
@ -138,7 +138,7 @@ FROM
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" 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) COLLATE "C" AS obj,
pg_describe_object(refclassid,refobjid,0) AS refobj, pg_describe_object(refclassid,refobjid,0) AS refobj,
deptype deptype
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid FROM pg_shdepend JOIN pg_database d ON dbid = d.oid

Write Preview
Loading…
Cancel
Save