From 449cdcd486bfc6864e4fa6784cc1526a94fe69db Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Tue, 30 Apr 2024 12:12:43 +0300 Subject: [PATCH] Stabilize regression tests introduced by 259c96fa8f Add the ORDER BY clause to new queries to avoid ordering ambiguity. Per buildfarm member rorqual. --- src/test/regress/expected/partition_merge.out | 5 +++-- src/test/regress/expected/partition_split.out | 3 ++- src/test/regress/sql/partition_merge.sql | 3 ++- src/test/regress/sql/partition_split.sql | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/partition_merge.out b/src/test/regress/expected/partition_merge.out index 92999703217..52e5c3ce0da 100644 --- a/src/test/regress/expected/partition_merge.out +++ b/src/test/regress/expected/partition_merge.out @@ -871,11 +871,12 @@ CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2); ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2; SELECT c.relname, a.amname FROM pg_class c JOIN pg_am a ON c.relam = a.oid -WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass); +WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass) +ORDER BY c.relname; relname | amname ---------+----------------------- - tp_0_2 | partitions_merge_heap t | partitions_merge_heap + tp_0_2 | partitions_merge_heap (2 rows) DROP TABLE t; diff --git a/src/test/regress/expected/partition_split.out b/src/test/regress/expected/partition_split.out index 326fa1bd400..641e1acc3d7 100644 --- a/src/test/regress/expected/partition_split.out +++ b/src/test/regress/expected/partition_split.out @@ -1503,7 +1503,8 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO PARTITION tp_1_2 FOR VALUES FROM (1) TO (2)); SELECT c.relname, a.amname FROM pg_class c JOIN pg_am a ON c.relam = a.oid -WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass); +WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass) +ORDER BY c.relname; relname | amname ---------+---------------------- t | partition_split_heap diff --git a/src/test/regress/sql/partition_merge.sql b/src/test/regress/sql/partition_merge.sql index 23795cf9d94..84a3462205a 100644 --- a/src/test/regress/sql/partition_merge.sql +++ b/src/test/regress/sql/partition_merge.sql @@ -544,7 +544,8 @@ CREATE TABLE tp_1_2 PARTITION OF t FOR VALUES FROM (1) TO (2); ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2; SELECT c.relname, a.amname FROM pg_class c JOIN pg_am a ON c.relam = a.oid -WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass); +WHERE c.oid IN ('t'::regclass, 'tp_0_2'::regclass) +ORDER BY c.relname; DROP TABLE t; DROP ACCESS METHOD partitions_merge_heap; diff --git a/src/test/regress/sql/partition_split.sql b/src/test/regress/sql/partition_split.sql index 73e8c2fbeb9..d2c687c41ba 100644 --- a/src/test/regress/sql/partition_split.sql +++ b/src/test/regress/sql/partition_split.sql @@ -889,7 +889,8 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO PARTITION tp_1_2 FOR VALUES FROM (1) TO (2)); SELECT c.relname, a.amname FROM pg_class c JOIN pg_am a ON c.relam = a.oid -WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass); +WHERE c.oid IN ('t'::regclass, 'tp_0_1'::regclass, 'tp_1_2'::regclass) +ORDER BY c.relname; DROP TABLE t; DROP ACCESS METHOD partition_split_heap; -- 2.39.5