aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-02-10 02:33:00 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2012-02-10 02:33:00 -0500
commitd06e2d200562837afa18058937f20460a3ea526a (patch)
tree5d1b2160f311b3903bc830c18de2099b36c4a790 /src
parent169c8a911260bd5a8b6910c458afa57a1ae29627 (diff)
downloadpostgresql-d06e2d200562837afa18058937f20460a3ea526a.tar.gz
postgresql-d06e2d200562837afa18058937f20460a3ea526a.zip
Add ORDER BY to a query to prevent occasional regression test failures.
Per buildfarm, we sometimes get row-ordering variations in the output. This also makes this query look more like numerous other ones in the same test file.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/inherit.out2
-rw-r--r--src/test/regress/sql/inherit.sql2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 7e8f5721303..6ef1cbdec79 100644
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -601,7 +601,7 @@ create table p1(ff1 int);
alter table only p1 add constraint p1chk check (ff1 > 0);
alter table p1 add constraint p2chk check (ff1 > 10);
-- conisonly should be true for ONLY constraint
-select pc.relname, pgc.conname, pgc.contype, pgc.conislocal, pgc.coninhcount, pgc.conisonly from pg_class as pc inner join pg_constraint as pgc on (pgc.conrelid = pc.oid) where pc.relname = 'p1';
+select pc.relname, pgc.conname, pgc.contype, pgc.conislocal, pgc.coninhcount, pgc.conisonly from pg_class as pc inner join pg_constraint as pgc on (pgc.conrelid = pc.oid) where pc.relname = 'p1' order by 1,2;
relname | conname | contype | conislocal | coninhcount | conisonly
---------+---------+---------+------------+-------------+-----------
p1 | p1chk | c | t | 0 | t
diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index 4dfbc07f94f..6fdbd18c251 100644
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -143,7 +143,7 @@ create table p1(ff1 int);
alter table only p1 add constraint p1chk check (ff1 > 0);
alter table p1 add constraint p2chk check (ff1 > 10);
-- conisonly should be true for ONLY constraint
-select pc.relname, pgc.conname, pgc.contype, pgc.conislocal, pgc.coninhcount, pgc.conisonly from pg_class as pc inner join pg_constraint as pgc on (pgc.conrelid = pc.oid) where pc.relname = 'p1';
+select pc.relname, pgc.conname, pgc.contype, pgc.conislocal, pgc.coninhcount, pgc.conisonly from pg_class as pc inner join pg_constraint as pgc on (pgc.conrelid = pc.oid) where pc.relname = 'p1' order by 1,2;
-- Test that child does not inherit ONLY constraints
create table c1 () inherits (p1);