Skip to content

Commit cd065a2

Browse files
committed
Fix some answer files
1 parent f8ed559 commit cd065a2

File tree

7 files changed

+563
-369
lines changed

7 files changed

+563
-369
lines changed

GNUmakefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ all:
1414
# $(MAKE) -C contrib/auto_explain all
1515
$(MAKE) -C contrib/citext all
1616
# $(MAKE) -C contrib/file_fdw all
17-
# $(MAKE) -C contrib/formatter all
17+
$(MAKE) -C contrib/formatter all
1818
# $(MAKE) -C contrib/formatter_fixedwidth all
1919
# $(MAKE) -C contrib/fuzzystrmatch all
2020
$(MAKE) -C contrib/extprotocol all
@@ -61,7 +61,7 @@ install:
6161
# $(MAKE) -C contrib/auto_explain $@
6262
$(MAKE) -C contrib/citext $@
6363
# $(MAKE) -C contrib/file_fdw $@
64-
# $(MAKE) -C contrib/formatter $@
64+
$(MAKE) -C contrib/formatter $@
6565
# $(MAKE) -C contrib/formatter_fixedwidth $@
6666
# $(MAKE) -C contrib/fuzzystrmatch $@
6767
$(MAKE) -C contrib/extprotocol $@

src/test/regress/expected/alter_table.out

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3997,8 +3997,7 @@ ALTER TABLE partitioned ALTER COLUMN b TYPE char(5);
39973997
ERROR: cannot alter column "b" because it is part of the partition key of relation "partitioned"
39983998
-- specifying storage parameters for partitioned tables is not supported
39993999
ALTER TABLE partitioned SET (fillfactor=100);
4000-
ERROR: cannot specify storage parameters for a partitioned table
4001-
HINT: Specify storage parameters for its leaf partitions instead.
4000+
ERROR: unrecognized parameter "fillfactor"
40024001
-- partitioned table cannot participate in regular inheritance
40034002
CREATE TABLE nonpartitioned (
40044003
a int,

src/test/regress/expected/create_table.out

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,7 @@ Number of partitions: 0
991991
DROP TABLE parted_col_comment;
992992
-- specifying storage parameters for partitioned tables is not supported
993993
CREATE TABLE parted_col_comment (a int, b text) PARTITION BY LIST (a) WITH (fillfactor=100);
994-
ERROR: cannot specify storage parameters for a partitioned table
995-
HINT: Specify storage parameters for its leaf partitions instead.
994+
ERROR: unrecognized parameter "fillfactor"
996995
-- list partitioning on array type column
997996
CREATE TABLE arrlp (a int[]) PARTITION BY LIST (a);
998997
CREATE TABLE arrlp12 PARTITION OF arrlp FOR VALUES IN ('{1}', '{2}');

src/test/regress/expected/external_table.out

Lines changed: 434 additions & 277 deletions
Large diffs are not rendered by default.

src/test/regress/expected/index_constraint_naming_partition.out

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,9 @@ CREATE FUNCTION recreate_two_level_table() RETURNS VOID
178178
$fn$;
179179
-- validate that there are no constraints when we start
180180
SELECT * FROM partition_tables_show_all('r');
181-
partition_name | parent_name | root_name | constraint_name | index_name | constraint_type
182-
----------------+-------------+-----------+-----------------+------------+-----------------
183-
(0 rows)
184-
181+
ERROR: relation "r" does not exist
182+
CONTEXT: SQL function "partition_tables" statement 1
183+
SQL function "partition_tables_show_all" statement 1
185184
-- UNIQUE constraint: validate we correctly add it and can only drop from root
186185
SELECT recreate_two_level_table();
187186
NOTICE: table "r" does not exist, skipping

src/test/regress/expected/partition_ddl.out

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,7 +2243,9 @@ CREATE TABLE mpp3250 (
22432243
subpartition by range (unique2) subpartition template ( start (0) end (1000) every (100) )
22442244
( start (0) end (1000) every (100));
22452245
alter table mpp3250 add default partition default_part;
2246-
copy mpp3250 from '@abs_srcdir@/data/onek.data';
2246+
\getenv abs_srcdir PG_ABS_SRCDIR
2247+
\set onek_data :abs_srcdir '/data/onek.data'
2248+
copy mpp3250 from :'onek_data';
22472249
CREATE TABLE mpp3375 (
22482250
unique1 int4,
22492251
unique2 int4,
@@ -2262,7 +2264,7 @@ CREATE TABLE mpp3375 (
22622264
stringu2 name,
22632265
string4 name
22642266
);
2265-
copy mpp3375 from '@abs_srcdir@/data/onek.data';
2267+
copy mpp3375 from :'onek_data';
22662268
CREATE TABLE mpp3375a (
22672269
unique1 int4,
22682270
unique2 int4,
@@ -2569,7 +2571,7 @@ CREATE TABLE mpp3261 (
25692571
stringu2 name,
25702572
string4 name
25712573
);
2572-
copy mpp3261 from '@abs_srcdir@/data/onek.data';
2574+
copy mpp3261 from :'onek_data';
25732575
CREATE TABLE mpp3261_part (
25742576
unique1 int4,
25752577
unique2 int4,

0 commit comments

Comments
 (0)