mirror of https://github.com/postgres/postgres
Fix unstable tests in partition_merge.sql and partition_split.sql.
The tests added by commit c086896625
were unstable due to
missing schema names when checking pg_tables and pg_indexes.
Backpatch to v17.
Reported by buildfarm.
This commit is contained in:
parent
c086896625
commit
4e5d6c4091
|
@ -862,13 +862,15 @@ SET search_path = partitions_merge_schema, pg_temp, public;
|
|||
ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
|
||||
ROLLBACK;
|
||||
-- Check the new partition inherits parent's tablespace
|
||||
SET search_path = partitions_merge_schema, public;
|
||||
CREATE TABLE t (i int PRIMARY KEY USING INDEX TABLESPACE regress_tblspace)
|
||||
PARTITION BY RANGE (i) TABLESPACE regress_tblspace;
|
||||
CREATE TABLE tp_0_1 PARTITION OF t FOR VALUES FROM (0) TO (1);
|
||||
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 tablename, tablespace FROM pg_tables
|
||||
WHERE tablename IN ('t', 'tp_0_2') ORDER BY tablename, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_2') AND schemaname = 'partitions_merge_schema'
|
||||
ORDER BY tablename, tablespace;
|
||||
tablename | tablespace
|
||||
-----------+------------------
|
||||
t | regress_tblspace
|
||||
|
@ -876,7 +878,8 @@ SELECT tablename, tablespace FROM pg_tables
|
|||
(2 rows)
|
||||
|
||||
SELECT tablename, indexname, tablespace FROM pg_indexes
|
||||
WHERE tablename IN ('t', 'tp_0_2') ORDER BY tablename, indexname, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_2') AND schemaname = 'partitions_merge_schema'
|
||||
ORDER BY tablename, indexname, tablespace;
|
||||
tablename | indexname | tablespace
|
||||
-----------+-------------+------------------
|
||||
t | t_pkey | regress_tblspace
|
||||
|
|
|
@ -1502,7 +1502,8 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO
|
|||
(PARTITION tp_0_1 FOR VALUES FROM (0) TO (1),
|
||||
PARTITION tp_1_2 FOR VALUES FROM (1) TO (2));
|
||||
SELECT tablename, tablespace FROM pg_tables
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') ORDER BY tablename, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') AND schemaname = 'partition_split_schema'
|
||||
ORDER BY tablename, tablespace;
|
||||
tablename | tablespace
|
||||
-----------+------------------
|
||||
t | regress_tblspace
|
||||
|
@ -1511,7 +1512,8 @@ SELECT tablename, tablespace FROM pg_tables
|
|||
(3 rows)
|
||||
|
||||
SELECT tablename, indexname, tablespace FROM pg_indexes
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') ORDER BY tablename, indexname, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') AND schemaname = 'partition_split_schema'
|
||||
ORDER BY tablename, indexname, tablespace;
|
||||
tablename | indexname | tablespace
|
||||
-----------+-------------+------------------
|
||||
t | t_pkey | regress_tblspace
|
||||
|
|
|
@ -537,15 +537,18 @@ ALTER TABLE t MERGE PARTITIONS (tp_0_1, tp_1_2) INTO tp_0_2;
|
|||
ROLLBACK;
|
||||
|
||||
-- Check the new partition inherits parent's tablespace
|
||||
SET search_path = partitions_merge_schema, public;
|
||||
CREATE TABLE t (i int PRIMARY KEY USING INDEX TABLESPACE regress_tblspace)
|
||||
PARTITION BY RANGE (i) TABLESPACE regress_tblspace;
|
||||
CREATE TABLE tp_0_1 PARTITION OF t FOR VALUES FROM (0) TO (1);
|
||||
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 tablename, tablespace FROM pg_tables
|
||||
WHERE tablename IN ('t', 'tp_0_2') ORDER BY tablename, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_2') AND schemaname = 'partitions_merge_schema'
|
||||
ORDER BY tablename, tablespace;
|
||||
SELECT tablename, indexname, tablespace FROM pg_indexes
|
||||
WHERE tablename IN ('t', 'tp_0_2') ORDER BY tablename, indexname, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_2') AND schemaname = 'partitions_merge_schema'
|
||||
ORDER BY tablename, indexname, tablespace;
|
||||
DROP TABLE t;
|
||||
|
||||
-- Check the new partition inherits parent's table access method
|
||||
|
|
|
@ -888,9 +888,11 @@ ALTER TABLE t SPLIT PARTITION tp_0_2 INTO
|
|||
(PARTITION tp_0_1 FOR VALUES FROM (0) TO (1),
|
||||
PARTITION tp_1_2 FOR VALUES FROM (1) TO (2));
|
||||
SELECT tablename, tablespace FROM pg_tables
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') ORDER BY tablename, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') AND schemaname = 'partition_split_schema'
|
||||
ORDER BY tablename, tablespace;
|
||||
SELECT tablename, indexname, tablespace FROM pg_indexes
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') ORDER BY tablename, indexname, tablespace;
|
||||
WHERE tablename IN ('t', 'tp_0_1', 'tp_1_2') AND schemaname = 'partition_split_schema'
|
||||
ORDER BY tablename, indexname, tablespace;
|
||||
DROP TABLE t;
|
||||
|
||||
-- Check new partitions inherits parent's table access method
|
||||
|
|
Loading…
Reference in New Issue