diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl old mode 100644 new mode 100755 index 576326daec7..587698024af --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -1118,6 +1118,23 @@ my %tests = ( }, }, + 'CONSTRAINT NOT NULL / INVALID' => { + create_sql => 'CREATE TABLE dump_test.test_table_nn ( + col1 int); + ALTER TABLE dump_test.test_table_nn ADD CONSTRAINT nn NOT NULL col1 NOT VALID;', + regexp => qr/^ + \QALTER TABLE dump_test.test_table_nn\E \n^\s+ + \QADD CONSTRAINT nn NOT NULL col1 NOT VALID;\E + /xm, + like => { + %full_runs, %dump_test_schema_runs, section_post_data => 1, + }, + unlike => { + exclude_dump_test_schema => 1, + only_dump_measurement => 1, + }, + }, + 'CONSTRAINT PRIMARY KEY / WITHOUT OVERLAPS' => { create_sql => 'CREATE TABLE dump_test.test_table_tpk ( col1 int4range, @@ -3803,13 +3820,16 @@ my %tests = ( create_sql => 'CREATE TABLE dump_test.test_table_generated ( col1 int primary key, col2 int generated always as (col1 * 2) stored, - col3 int generated always as (col1 * 3) virtual - );', + col3 int generated always as (col1 * 3) virtual, + col4 int + ); + ALTER TABLE dump_test.test_table_generated ADD CONSTRAINT dump_test_nn NOT NULL col4 NOT VALID;', regexp => qr/^ \QCREATE TABLE dump_test.test_table_generated (\E\n \s+\Qcol1 integer NOT NULL,\E\n \s+\Qcol2 integer GENERATED ALWAYS AS ((col1 * 2)) STORED,\E\n - \s+\Qcol3 integer GENERATED ALWAYS AS ((col1 * 3))\E\n + \s+\Qcol3 integer GENERATED ALWAYS AS ((col1 * 3)),\E\n + \s+\Qcol4 integer\E\n \); /xms, like => @@ -3820,6 +3840,19 @@ my %tests = ( }, }, + 'ALTER TABLE dump_test.test_table_generated' => { + regexp => qr/^ + \QALTER TABLE dump_test.test_table_generated\E \n^\s+ + \QADD CONSTRAINT dump_test_nn NOT NULL col4 NOT VALID;\E + /xm, + like => + { %full_runs, %dump_test_schema_runs, section_post_data => 1, }, + unlike => { + exclude_dump_test_schema => 1, + only_dump_measurement => 1, + }, + }, + 'CREATE TABLE test_table_generated_child1 (without local columns)' => { create_order => 4, create_sql => 'CREATE TABLE dump_test.test_table_generated_child1 () diff --git a/src/test/regress/expected/constraints.out b/src/test/regress/expected/constraints.out index b8398efcdeb..94d26621b91 100644 --- a/src/test/regress/expected/constraints.out +++ b/src/test/regress/expected/constraints.out @@ -1073,11 +1073,43 @@ ERROR: constraint "nn1" conflicts with NOT VALID constraint on child table "pp_ ALTER TABLE pp_nn_1 VALIDATE CONSTRAINT nn1; ALTER TABLE pp_nn ATTACH PARTITION pp_nn_1 FOR VALUES IN (NULL,5); --ok DROP TABLE pp_nn; -DEALLOCATE get_nnconstraint_info; -- Create table with NOT NULL INVALID constraint, for pg_upgrade. CREATE TABLE notnull_tbl1_upg (a INTEGER, b INTEGER); INSERT INTO notnull_tbl1_upg VALUES (NULL, 1), (NULL, 2), (300, 3); ALTER TABLE notnull_tbl1_upg ADD CONSTRAINT nn NOT NULL a NOT VALID; +-- Inherit test for pg_upgrade +CREATE TABLE notnull_parent_upg (a INTEGER); +CREATE TABLE notnull_child_upg () INHERITS (notnull_parent_upg); +ALTER TABLE notnull_child_upg ADD CONSTRAINT nn NOT NULL a; +ALTER TABLE notnull_parent_upg ADD CONSTRAINT nn NOT NULL a NOT VALID; +SELECT conrelid::regclass, contype, convalidated, conislocal FROM pg_catalog.pg_constraint +WHERE conrelid in ('notnull_parent_upg'::regclass, 'notnull_child_upg'::regclass); + conrelid | contype | convalidated | conislocal +--------------------+---------+--------------+------------ + notnull_parent_upg | n | f | t + notnull_child_upg | n | t | t +(2 rows) + +-- Partition table test, for pg_upgrade +CREATE TABLE notnull_part1_upg (a INTEGER, b INTEGER) PARTITION BY LIST (a); +ALTER TABLE notnull_part1_upg ADD CONSTRAINT notnull_con NOT NULL a NOT VALID; --ok +CREATE TABLE notnull_part1_1_upg PARTITION OF notnull_part1_upg FOR VALUES IN (1,2); +CREATE TABLE notnull_part1_2_upg (a int, CONSTRAINT nn2 NOT NULL a, b int); +ALTER TABLE notnull_part1_upg ATTACH PARTITION notnull_part1_2_upg FOR VALUES IN (3,4); +CREATE TABLE notnull_part1_3_upg (a int, b int); +INSERT INTO notnull_part1_3_upg values(NULL,1); +ALTER TABLE notnull_part1_3_upg add CONSTRAINT nn3 NOT NULL a NOT VALID; +ALTER TABLE notnull_part1_upg ATTACH PARTITION notnull_part1_3_upg FOR VALUES IN (NULL,5); +EXECUTE get_nnconstraint_info('{notnull_part1_upg, notnull_part1_1_upg, notnull_part1_2_upg, notnull_part1_3_upg}'); + conrelid | conname | convalidated | coninhcount +---------------------+-------------+--------------+------------- + notnull_part1_upg | notnull_con | f | 0 + notnull_part1_1_upg | notnull_con | t | 1 + notnull_part1_2_upg | nn2 | t | 1 + notnull_part1_3_upg | nn3 | f | 1 +(4 rows) + +DEALLOCATE get_nnconstraint_info; -- end of NOT NULL VALID/NOT VALID -------------------------------- -- Verify that constraint names and NO INHERIT are properly considered when -- multiple constraint are specified, either explicitly or via SERIAL/PK/etc, diff --git a/src/test/regress/sql/constraints.sql b/src/test/regress/sql/constraints.sql index fec1213aa49..cc1bfd2ef89 100644 --- a/src/test/regress/sql/constraints.sql +++ b/src/test/regress/sql/constraints.sql @@ -771,12 +771,29 @@ ALTER TABLE pp_nn_1 VALIDATE CONSTRAINT nn1; ALTER TABLE pp_nn ATTACH PARTITION pp_nn_1 FOR VALUES IN (NULL,5); --ok DROP TABLE pp_nn; -DEALLOCATE get_nnconstraint_info; - -- Create table with NOT NULL INVALID constraint, for pg_upgrade. CREATE TABLE notnull_tbl1_upg (a INTEGER, b INTEGER); INSERT INTO notnull_tbl1_upg VALUES (NULL, 1), (NULL, 2), (300, 3); ALTER TABLE notnull_tbl1_upg ADD CONSTRAINT nn NOT NULL a NOT VALID; +-- Inherit test for pg_upgrade +CREATE TABLE notnull_parent_upg (a INTEGER); +CREATE TABLE notnull_child_upg () INHERITS (notnull_parent_upg); +ALTER TABLE notnull_child_upg ADD CONSTRAINT nn NOT NULL a; +ALTER TABLE notnull_parent_upg ADD CONSTRAINT nn NOT NULL a NOT VALID; +SELECT conrelid::regclass, contype, convalidated, conislocal FROM pg_catalog.pg_constraint +WHERE conrelid in ('notnull_parent_upg'::regclass, 'notnull_child_upg'::regclass); +-- Partition table test, for pg_upgrade +CREATE TABLE notnull_part1_upg (a INTEGER, b INTEGER) PARTITION BY LIST (a); +ALTER TABLE notnull_part1_upg ADD CONSTRAINT notnull_con NOT NULL a NOT VALID; --ok +CREATE TABLE notnull_part1_1_upg PARTITION OF notnull_part1_upg FOR VALUES IN (1,2); +CREATE TABLE notnull_part1_2_upg (a int, CONSTRAINT nn2 NOT NULL a, b int); +ALTER TABLE notnull_part1_upg ATTACH PARTITION notnull_part1_2_upg FOR VALUES IN (3,4); +CREATE TABLE notnull_part1_3_upg (a int, b int); +INSERT INTO notnull_part1_3_upg values(NULL,1); +ALTER TABLE notnull_part1_3_upg add CONSTRAINT nn3 NOT NULL a NOT VALID; +ALTER TABLE notnull_part1_upg ATTACH PARTITION notnull_part1_3_upg FOR VALUES IN (NULL,5); +EXECUTE get_nnconstraint_info('{notnull_part1_upg, notnull_part1_1_upg, notnull_part1_2_upg, notnull_part1_3_upg}'); +DEALLOCATE get_nnconstraint_info; -- end of NOT NULL VALID/NOT VALID --------------------------------