Skip to content

Commit 449cdcd

Browse files
committed
Stabilize regression tests introduced by 259c96f
Add the ORDER BY clause to new queries to avoid ordering ambiguity. Per buildfarm member rorqual.
1 parent 259c96f commit 449cdcd

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/test/regress/expected/partition_merge.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,11 +871,12 @@ CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2);
871871
ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
872872
SELECT c.relname, a.amname
873873
FROM pg_class c JOIN pg_am a ON c.relam = a.oid
874-
WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass);
874+
WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass)
875+
ORDER BY c.relname;
875876
relname | amname
876877
---------+-----------------------
877-
tp_0_2 | partitions_merge_heap
878878
t | partitions_merge_heap
879+
tp_0_2 | partitions_merge_heap
879880
(2 rows)
880881

881882
DROP TABLE t;

src/test/regress/expected/partition_split.out

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,8 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO
15031503
PARTITION tp_1_2 FOR VALUES FROM (1) TO (2));
15041504
SELECT c.relname, a.amname
15051505
FROM pg_class c JOIN pg_am a ON c.relam = a.oid
1506-
WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass);
1506+
WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass)
1507+
ORDER BY c.relname;
15071508
relname | amname
15081509
---------+----------------------
15091510
t | partition_split_heap

src/test/regress/sql/partition_merge.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,8 @@ CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2);
544544
ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
545545
SELECT c.relname, a.amname
546546
FROM pg_class c JOIN pg_am a ON c.relam = a.oid
547-
WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass);
547+
WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass)
548+
ORDER BY c.relname;
548549
DROP TABLE t;
549550
DROP ACCESS METHOD partitions_merge_heap;
550551

src/test/regress/sql/partition_split.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,8 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO
889889
PARTITION tp_1_2 FOR VALUES FROM (1) TO (2));
890890
SELECT c.relname, a.amname
891891
FROM pg_class c JOIN pg_am a ON c.relam = a.oid
892-
WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass);
892+
WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass)
893+
ORDER BY c.relname;
893894
DROP TABLE t;
894895
DROP ACCESS METHOD partition_split_heap;
895896

0 commit comments

Comments
 (0)