From 2ed16aacf1af1e1a26bffb121a19d1ad5f5177f0 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 7 Apr 2023 22:25:46 -0700 Subject: [PATCH] Fix underspecified sort order in inherit.sql Introduced in e056c557aef4. Per buildfarm member prion. --- src/test/regress/expected/inherit.out | 9 ++++++--- src/test/regress/sql/inherit.sql | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index b3fd089acc..166b4c922f 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -1997,7 +1997,8 @@ select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit ------------+-----------------------+---------+--------+---------+-------------+------------+-------------- inh_parent | inh_parent_a_not_null | n | {1} | a | 0 | t | f @@ -2009,7 +2010,8 @@ select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit ------------+-----------------------+---------+--------+---------+-------------+------------+-------------- inh_parent | inh_parent_a_not_null | n | {1} | a | 0 | t | f @@ -2021,7 +2023,8 @@ select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit ----------+---------+---------+--------+---------+-------------+------------+-------------- (0 rows) diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql index 2ec18de4b8..a8ba2a31a7 100644 --- a/src/test/regress/sql/inherit.sql +++ b/src/test/regress/sql/inherit.sql @@ -747,19 +747,22 @@ select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; alter table inh_child alter a drop not null; select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; alter table inh_parent alter a drop not null; select conrelid::regclass, conname, contype, conkey, (select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]), coninhcount, conislocal, connoinherit from pg_constraint where contype in ('n','p') and - conrelid in ('inh_child'::regclass, 'inh_parent'::regclass); + conrelid in ('inh_child'::regclass, 'inh_parent'::regclass) + order by 1, 2; drop table inh_parent, inh_child; -- NOT NULL NO INHERIT -- 2.30.2