Commit 257d8157 authored by Tom Lane's avatar Tom Lane

Fix unstable regression test results.

Commit 2ac3ef7a added a query with an underdetermined output row order;
it has failed multiple times in the buildfarm since then.  Add an ORDER BY
to fix.  Also, don't rely on a DROP CASCADE to drop in a well-determined
order; that hasn't failed yet but I don't trust it much, and we're not
saving any typing by using CASCADE anyway.
parent 80a7298b
...@@ -314,7 +314,8 @@ from pg_attribute ...@@ -314,7 +314,8 @@ from pg_attribute
where attname = 'a' where attname = 'a'
and (attrelid = 'p'::regclass and (attrelid = 'p'::regclass
or attrelid = 'p1'::regclass or attrelid = 'p1'::regclass
or attrelid = 'p11'::regclass); or attrelid = 'p11'::regclass)
order by attrelid::regclass::text;
attrelid | attname | attnum attrelid | attname | attnum
----------+---------+-------- ----------+---------+--------
p | a | 1 p | a | 1
...@@ -333,7 +334,4 @@ select tableoid::regclass, * from p; ...@@ -333,7 +334,4 @@ select tableoid::regclass, * from p;
(1 row) (1 row)
-- cleanup -- cleanup
drop table p cascade; drop table p, p1, p11;
NOTICE: drop cascades to 2 other objects
DETAIL: drop cascades to table p1
drop cascades to table p11
...@@ -185,7 +185,8 @@ from pg_attribute ...@@ -185,7 +185,8 @@ from pg_attribute
where attname = 'a' where attname = 'a'
and (attrelid = 'p'::regclass and (attrelid = 'p'::regclass
or attrelid = 'p1'::regclass or attrelid = 'p1'::regclass
or attrelid = 'p11'::regclass); or attrelid = 'p11'::regclass)
order by attrelid::regclass::text;
alter table p1 attach partition p11 for values from (2) to (5); alter table p1 attach partition p11 for values from (2) to (5);
alter table p attach partition p1 for values from (1, 2) to (1, 10); alter table p attach partition p1 for values from (1, 2) to (1, 10);
...@@ -195,4 +196,4 @@ insert into p values (1, 2); ...@@ -195,4 +196,4 @@ insert into p values (1, 2);
select tableoid::regclass, * from p; select tableoid::regclass, * from p;
-- cleanup -- cleanup
drop table p cascade; drop table p, p1, p11;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment