Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b7dc5da

Browse files
committed
Force COLLATE "C" to stabilize ordering, redux.
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
1 parent 900d114 commit b7dc5da

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/test/modules/test_pg_dump/expected/test_pg_dump.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ FROM
135135
type regress_pg_dump_schema.test_type | postgres | regress_dump_test_role | USAGE | f
136136
(58 rows)
137137

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

268-
SELECT pg_describe_object(classid,objid,objsubid) AS obj,
268+
SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
269269
pg_describe_object(refclassid,refobjid,0) AS refobj,
270270
deptype
271271
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid

src/test/modules/test_pg_dump/sql/test_pg_dump.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ FROM
8686
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
8787
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
8888
aclexplode(s.initprivs) a;
89-
SELECT pg_describe_object(classid,objid,objsubid) AS obj,
89+
SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
9090
pg_describe_object(refclassid,refobjid,0) AS refobj,
9191
deptype
9292
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid
@@ -138,7 +138,7 @@ FROM
138138
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
139139
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
140140
aclexplode(s.initprivs) a;
141-
SELECT pg_describe_object(classid,objid,objsubid) AS obj,
141+
SELECT pg_describe_object(classid,objid,objsubid) COLLATE "C" AS obj,
142142
pg_describe_object(refclassid,refobjid,0) AS refobj,
143143
deptype
144144
FROM pg_shdepend JOIN pg_database d ON dbid = d.oid

0 commit comments

Comments
 (0)