Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 32bc0d0

Browse files
committed
Fix underspecified sort order in test query
Fail in e056c55.
1 parent f3fa313 commit 32bc0d0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/test/regress/expected/inherit.out

+4-4
Original file line numberDiff line numberDiff line change
@@ -2218,15 +2218,15 @@ select conrelid::regclass, contype, conname,
22182218
from pg_constraint where contype = 'n' and
22192219
conrelid::regclass in ('inh_p1', 'inh_p2', 'inh_p3', 'inh_p4',
22202220
'inh_multiparent')
2221-
order by 1, 2;
2221+
order by conrelid::regclass::text, conname;
22222222
conrelid | contype | conname | attname | coninhcount | conislocal
22232223
-----------------+---------+--------------------+---------+-------------+------------
2224+
inh_multiparent | n | inh_p1_f1_not_null | f1 | 3 | f
2225+
inh_multiparent | n | inh_p4_f3_not_null | f3 | 1 | f
22242226
inh_p1 | n | inh_p1_f1_not_null | f1 | 0 | t
22252227
inh_p2 | n | inh_p2_f1_not_null | f1 | 0 | t
22262228
inh_p4 | n | inh_p4_f1_not_null | f1 | 0 | t
22272229
inh_p4 | n | inh_p4_f3_not_null | f3 | 0 | t
2228-
inh_multiparent | n | inh_p1_f1_not_null | f1 | 3 | f
2229-
inh_multiparent | n | inh_p4_f3_not_null | f3 | 1 | f
22302230
(6 rows)
22312231

22322232
create table inh_multiparent2 (a int not null, f1 int) inherits(inh_p3, inh_multiparent);
@@ -2237,7 +2237,7 @@ select conrelid::regclass, contype, conname,
22372237
coninhcount, conislocal
22382238
from pg_constraint where contype = 'n' and
22392239
conrelid::regclass in ('inh_p3', 'inh_multiparent', 'inh_multiparent2')
2240-
order by 1, 2;
2240+
order by conrelid::regclass::text, conname;
22412241
conrelid | contype | conname | attname | coninhcount | conislocal
22422242
------------------+---------+-----------------------------+---------+-------------+------------
22432243
inh_multiparent | n | inh_p1_f1_not_null | f1 | 3 | f

src/test/regress/sql/inherit.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -875,15 +875,15 @@ select conrelid::regclass, contype, conname,
875875
from pg_constraint where contype = 'n' and
876876
conrelid::regclass in ('inh_p1', 'inh_p2', 'inh_p3', 'inh_p4',
877877
'inh_multiparent')
878-
order by 1, 2;
878+
order by conrelid::regclass::text, conname;
879879

880880
create table inh_multiparent2 (a int not null, f1 int) inherits(inh_p3, inh_multiparent);
881881
select conrelid::regclass, contype, conname,
882882
(select attname from pg_attribute where attrelid = conrelid and attnum = conkey[1]),
883883
coninhcount, conislocal
884884
from pg_constraint where contype = 'n' and
885885
conrelid::regclass in ('inh_p3', 'inh_multiparent', 'inh_multiparent2')
886-
order by 1, 2;
886+
order by conrelid::regclass::text, conname;
887887

888888
drop table inh_p1, inh_p2, inh_p3, inh_p4 cascade;
889889

0 commit comments

Comments
 (0)