Commit900d114

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 thewoods, but certainly this much is needed.)Per buildfarm and David Rowley.Discussion:https://postgr.es/m/CAApHDvo8pMk5WWFAqwGzuQ-Xh+957W61io_OsCP0oUzqCCODTg@mail.gmail.com

1 parent9d9ece4 commit900d114Copy full SHA for 900d114

File tree

-4

lines changed

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

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ SELECT s.obj,`
`70`	`70`	`ELSE a.grantee::regrole::name END,`
`71`	`71`	`a.privilege_type, a.is_grantable`
`72`	`72`	`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`
`74`	`74`	`FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,`
`75`	`75`	`aclexplode(s.initprivs) a;`
`76`	`76`	`obj \| grantor \| grantee \| privilege_type \| is_grantable`
`@@ -207,7 +207,7 @@ SELECT s.obj,`
`207`	`207`	`ELSE a.grantee::regrole::name END,`
`208`	`208`	`a.privilege_type, a.is_grantable`
`209`	`209`	`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`
`211`	`211`	`FROM pg_init_privs WHERE privtype = 'e' ORDER BY 1) s,`
`212`	`212`	`aclexplode(s.initprivs) a;`
`213`	`213`	`obj \| grantor \| grantee \| privilege_type \| is_grantable`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ SELECT s.obj,`
`83`	`83`	`ELSEa.grantee::regrole::name END,`
`84`	`84`	`a.privilege_type,a.is_grantable`
`85`	`85`	`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`
`87`	`87`	`FROM pg_init_privsWHERE privtype='e'ORDER BY1) s,`
`88`	`88`	`aclexplode(s.initprivs) a;`
`89`	`89`	`SELECT pg_describe_object(classid,objid,objsubid)AS obj,`
`@@ -135,7 +135,7 @@ SELECT s.obj,`
`135`	`135`	`ELSEa.grantee::regrole::name END,`
`136`	`136`	`a.privilege_type,a.is_grantable`
`137`	`137`	`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`
`139`	`139`	`FROM pg_init_privsWHERE privtype='e'ORDER BY1) s,`
`140`	`140`	`aclexplode(s.initprivs) a;`
`141`	`141`	`SELECT pg_describe_object(classid,objid,objsubid)AS obj,`

Comments

(0)