mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-09 08:10:09 +08:00
Fix ALTER TABLE ADD COLUMN ... PRIMARY KEY so that the new column is correctly
checked to see if it's been initialized to all non-nulls. The implicit NOT NULL constraint was not being checked during the ALTER (in fact, not even if there was an explicit NOT NULL too), because ATExecAddColumn neglected to set the flag needed to make the test happen. This has been broken since the capability was first added, in 8.0. Brendan Jurd, per a report from Kaloyan Iliev.
This commit is contained in:
parent
a357880dde
commit
7f3d1583f8
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.142.4.7 2007/02/02 00:08:01 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.142.4.8 2008/04/24 20:18:23 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -3135,6 +3135,11 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
|
||||
tab->newvals = lappend(tab->newvals, newval);
|
||||
}
|
||||
|
||||
/*
|
||||
* If the new column is NOT NULL, tell Phase 3 it needs to test that.
|
||||
*/
|
||||
tab->new_notnull |= colDef->is_not_null;
|
||||
|
||||
/*
|
||||
* Add needed dependency entries for the new column.
|
||||
*/
|
||||
|
@ -429,6 +429,18 @@ create table atacc1 ( test int );
|
||||
alter table atacc1 add constraint atacc_test1 primary key (test1);
|
||||
ERROR: column "test1" named in key does not exist
|
||||
drop table atacc1;
|
||||
-- adding a new column as primary key to a non-empty table.
|
||||
-- should fail unless the column has a non-null default value.
|
||||
create table atacc1 ( test int );
|
||||
insert into atacc1 (test) values (0);
|
||||
-- add a primary key column without a default (fails).
|
||||
alter table atacc1 add column test2 int primary key;
|
||||
NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "atacc1_pkey" for table "atacc1"
|
||||
ERROR: column "test2" contains null values
|
||||
-- now add a primary key column with a default (succeeds).
|
||||
alter table atacc1 add column test2 int default 0 primary key;
|
||||
NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "atacc1_pkey" for table "atacc1"
|
||||
drop table atacc1;
|
||||
-- something a little more complicated
|
||||
create table atacc1 ( test int, test2 int);
|
||||
-- add a primary key constraint
|
||||
|
@ -447,6 +447,16 @@ create table atacc1 ( test int );
|
||||
alter table atacc1 add constraint atacc_test1 primary key (test1);
|
||||
drop table atacc1;
|
||||
|
||||
-- adding a new column as primary key to a non-empty table.
|
||||
-- should fail unless the column has a non-null default value.
|
||||
create table atacc1 ( test int );
|
||||
insert into atacc1 (test) values (0);
|
||||
-- add a primary key column without a default (fails).
|
||||
alter table atacc1 add column test2 int primary key;
|
||||
-- now add a primary key column with a default (succeeds).
|
||||
alter table atacc1 add column test2 int default 0 primary key;
|
||||
drop table atacc1;
|
||||
|
||||
-- something a little more complicated
|
||||
create table atacc1 ( test int, test2 int);
|
||||
-- add a primary key constraint
|
||||
|
Loading…
Reference in New Issue
Block a user