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

Commit 900d114

Browse files
committed
Force COLLATE "C" to stabilize ordering in new test_pg_dump queries.
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
1 parent 9d9ece4 commit 900d114

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
@@ -70,7 +70,7 @@ SELECT s.obj,
7070
ELSE a.grantee::regrole::name END,
7171
a.privilege_type, a.is_grantable
7272
FROM
73-
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
73+
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
7474
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
7575
aclexplode(s.initprivs) a;
7676
obj | grantor | grantee | privilege_type | is_grantable
@@ -207,7 +207,7 @@ SELECT s.obj,
207207
ELSE a.grantee::regrole::name END,
208208
a.privilege_type, a.is_grantable
209209
FROM
210-
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
210+
(SELECT pg_describe_object(classoid,objoid,objsubid) COLLATE "C" AS obj, initprivs
211211
FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,
212212
aclexplode(s.initprivs) a;
213213
obj | grantor | grantee | privilege_type | is_grantable

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SELECT s.obj,
8383
ELSE a.grantee::regrole::name END,
8484
a.privilege_type, a.is_grantable
8585
FROM
86-
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
86+
(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;
8989
SELECT pg_describe_object(classid,objid,objsubid) AS obj,
@@ -135,7 +135,7 @@ SELECT s.obj,
135135
ELSE a.grantee::regrole::name END,
136136
a.privilege_type, a.is_grantable
137137
FROM
138-
(SELECT pg_describe_object(classoid,objoid,objsubid) AS obj, initprivs
138+
(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;
141141
SELECT pg_describe_object(classid,objid,objsubid) AS obj,

0 commit comments

Comments
 (0)