aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2023-04-07 22:25:46 -0700
committerAndres Freund <andres@anarazel.de>2023-04-07 22:25:46 -0700
commit2ed16aacf1af1e1a26bffb121a19d1ad5f5177f0 (patch)
tree25532fd47c60db01d105fecef451c748686098b9
parent4397abd0a2af955326c0608d63f3716ce5901004 (diff)
downloadpostgresql-2ed16aacf1af1e1a26bffb121a19d1ad5f5177f0.tar.gz
postgresql-2ed16aacf1af1e1a26bffb121a19d1ad5f5177f0.zip
Fix underspecified sort order in inherit.sql
Introduced in e056c557aef4. Per buildfarm member prion.
-rw-r--r--src/test/regress/expected/inherit.out9
-rw-r--r--src/test/regress/sql/inherit.sql9
2 files changed, 12 insertions, 6 deletions
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index b3fd089acc9..166b4c922fd 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 2ec18de4b8d..a8ba2a31a70 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