Skip to content

Commit 2ed16aa

Browse files
committed
Fix underspecified sort order in inherit.sql
Introduced in e056c55. Per buildfarm member prion.
1 parent 4397abd commit 2ed16aa

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/test/regress/expected/inherit.out

+6-3
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,8 @@ select conrelid::regclass, conname, contype, conkey,
19971997
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
19981998
coninhcount, conislocal, connoinherit
19991999
from pg_constraint where contype in ('n','p') and
2000-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
2000+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
2001+
order by 1, 2;
20012002
conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit
20022003
------------+-----------------------+---------+--------+---------+-------------+------------+--------------
20032004
inh_parent | inh_parent_a_not_null | n | {1} | a | 0 | t | f
@@ -2009,7 +2010,8 @@ select conrelid::regclass, conname, contype, conkey,
20092010
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
20102011
coninhcount, conislocal, connoinherit
20112012
from pg_constraint where contype in ('n','p') and
2012-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
2013+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
2014+
order by 1, 2;
20132015
conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit
20142016
------------+-----------------------+---------+--------+---------+-------------+------------+--------------
20152017
inh_parent | inh_parent_a_not_null | n | {1} | a | 0 | t | f
@@ -2021,7 +2023,8 @@ select conrelid::regclass, conname, contype, conkey,
20212023
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
20222024
coninhcount, conislocal, connoinherit
20232025
from pg_constraint where contype in ('n','p') and
2024-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
2026+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
2027+
order by 1, 2;
20252028
conrelid | conname | contype | conkey | attname | coninhcount | conislocal | connoinherit
20262029
----------+---------+---------+--------+---------+-------------+------------+--------------
20272030
(0 rows)

src/test/regress/sql/inherit.sql

+6-3
Original file line numberDiff line numberDiff line change
@@ -747,19 +747,22 @@ select conrelid::regclass, conname, contype, conkey,
747747
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
748748
coninhcount, conislocal, connoinherit
749749
from pg_constraint where contype in ('n','p') and
750-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
750+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
751+
order by 1, 2;
751752
alter table inh_child alter a drop not null;
752753
select conrelid::regclass, conname, contype, conkey,
753754
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
754755
coninhcount, conislocal, connoinherit
755756
from pg_constraint where contype in ('n','p') and
756-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
757+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
758+
order by 1, 2;
757759
alter table inh_parent alter a drop not null;
758760
select conrelid::regclass, conname, contype, conkey,
759761
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
760762
coninhcount, conislocal, connoinherit
761763
from pg_constraint where contype in ('n','p') and
762-
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass);
764+
conrelid in ('inh_child'::regclass, 'inh_parent'::regclass)
765+
order by 1, 2;
763766
drop table inh_parent, inh_child;
764767

765768
-- NOT NULL NO INHERIT

0 commit comments

Comments
 (0)