database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-11 05:41:32 +03:00
Code

Fix ADD IF NOT EXISTS used in conjunction with ALTER TABLE ONLY

Browse Source 
The flag for IF NOT EXISTS was only being passed down in the normal
recursing case. It's been this way since originally added in 9.6 in
commit 2cd40adb85 so backpatch back to 9.6.
This commit is contained in:
Greg Stark 2018-12-19 18:28:35 -05:00
parent 7c2bc40b8b
commit 5668afeb6d
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/commands/tablecmds.c
View File

@ -3477,7 +3477,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
* VIEW */ * VIEW */
address = ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def, address = ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
false, false, false, false, false, false,
false, lockmode); cmd->missing_ok, lockmode);
break; break;
case AT_AddColumnRecurse: case AT_AddColumnRecurse:
address = ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def, address = ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,

6
src/test/regress/expected/alter_table.out
View File

@ -3153,6 +3153,9 @@ Table "public.test_add_column"
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer; -- fail because c2 already exists ADD COLUMN c2 integer; -- fail because c2 already exists
ERROR: column "c2" of relation "test_add_column" already exists ERROR: column "c2" of relation "test_add_column" already exists
ALTER TABLE ONLY test_add_column
ADD COLUMN c2 integer; -- fail because c2 already exists
ERROR: column "c2" of relation "test_add_column" already exists
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Modifiers
@ -3163,6 +3166,9 @@ Table "public.test_add_column"
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists
NOTICE: column "c2" of relation "test_add_column" already exists, skipping NOTICE: column "c2" of relation "test_add_column" already exists, skipping
ALTER TABLE ONLY test_add_column
ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists
NOTICE: column "c2" of relation "test_add_column" already exists, skipping
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Modifiers

4
src/test/regress/sql/alter_table.sql
View File

@ -1970,9 +1970,13 @@ ALTER TABLE test_add_column
\d test_add_column \d test_add_column
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer; -- fail because c2 already exists ADD COLUMN c2 integer; -- fail because c2 already exists
ALTER TABLE ONLY test_add_column
ADD COLUMN c2 integer; -- fail because c2 already exists
\d test_add_column \d test_add_column
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists
ALTER TABLE ONLY test_add_column
ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists
\d test_add_column \d test_add_column
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer, -- fail because c2 already exists ADD COLUMN c2 integer, -- fail because c2 already exists