diff options
| -rw-r--r-- | src/test/regress/expected/partition_merge.out | 7 | ||||
| -rw-r--r-- | src/test/regress/expected/partition_split.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/partition_merge.sql | 7 | ||||
| -rw-r--r-- | src/test/regress/sql/partition_split.sql | 6 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/test/regress/expected/partition_merge.out b/src/test/regress/expected/partition_merge.out index 26bf58b23db..59836e2d35e 100644 --- a/src/test/regress/expected/partition_merge.out +++ b/src/test/regress/expected/partition_merge.out @@ -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 diff --git a/src/test/regress/expected/partition_split.out b/src/test/regress/expected/partition_split.out index 1a8c95ad819..dc9a5130ccc 100644 --- a/src/test/regress/expected/partition_split.out +++ b/src/test/regress/expected/partition_split.out @@ -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 diff --git a/src/test/regress/sql/partition_merge.sql b/src/test/regress/sql/partition_merge.sql index 200bd3e7620..bede819af94 100644 --- a/src/test/regress/sql/partition_merge.sql +++ b/src/test/regress/sql/partition_merge.sql @@ -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 diff --git a/src/test/regress/sql/partition_split.sql b/src/test/regress/sql/partition_split.sql index 5143d85ec01..ef5ea07f740 100644 --- a/src/test/regress/sql/partition_split.sql +++ b/src/test/regress/sql/partition_split.sql @@ -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 |