Commitb7dc5da

committed

Force COLLATE "C" to stabilize ordering, redux.

David Rowley correctly pointed out that I'd collat-ified onlyone of the two troublesome queries. Definitely not my day.Discussion:https://postgr.es/m/CAApHDvo8pMk5WWFAqwGzuQ-Xh+957W61io_OsCP0oUzqCCODTg@mail.gmail.com

1 parent900d114 commitb7dc5daCopy full SHA for b7dc5da

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
`@@ -135,7 +135,7 @@ FROM`
`135`	`135`	`type regress_pg_dump_schema.test_type \| postgres \| regress_dump_test_role \| USAGE \| f`
`136`	`136`	`(58 rows)`
`137`	`137`
`138`		`-SELECT pg_describe_object(classid,objid,objsubid) AS obj,`
	`138`	`+SELECT pg_describe_object(classid,objid,objsubid)COLLATE "C"AS obj,`
`139`	`139`	`pg_describe_object(refclassid,refobjid,0) AS refobj,`
`140`	`140`	`deptype`
`141`	`141`	`FROM pg_shdepend JOIN pg_database d ON dbid = d.oid`
`@@ -265,7 +265,7 @@ FROM`
`265`	`265`	`type regress_pg_dump_schema.test_type \| postgres \| postgres \| USAGE \| f`
`266`	`266`	`(51 rows)`
`267`	`267`
`268`		`-SELECT pg_describe_object(classid,objid,objsubid) AS obj,`
	`268`	`+SELECT pg_describe_object(classid,objid,objsubid)COLLATE "C"AS obj,`
`269`	`269`	`pg_describe_object(refclassid,refobjid,0) AS refobj,`
`270`	`270`	`deptype`
`271`	`271`	`FROM pg_shdepend JOIN pg_database d ON dbid = d.oid`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ FROM`
`86`	`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`		`-SELECT pg_describe_object(classid,objid,objsubid)AS obj,`
	`89`	`+SELECT pg_describe_object(classid,objid,objsubid)COLLATE"C"AS obj,`
`90`	`90`	`pg_describe_object(refclassid,refobjid,0)AS refobj,`
`91`	`91`	`deptype`
`92`	`92`	`FROM pg_shdependJOIN pg_database dON dbid=d.oid`
`@@ -138,7 +138,7 @@ FROM`
`138`	`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`		`-SELECT pg_describe_object(classid,objid,objsubid)AS obj,`
	`141`	`+SELECT pg_describe_object(classid,objid,objsubid)COLLATE"C"AS obj,`
`142`	`142`	`pg_describe_object(refclassid,refobjid,0)AS refobj,`
`143`	`143`	`deptype`
`144`	`144`	`FROM pg_shdependJOIN pg_database dON dbid=d.oid`

Comments

(0)