From 6c08acadb5fb0ef1c4f8d6c588f18f6006fcbfa0 Mon Sep 17 00:00:00 2001 From: tanghy Date: Sun, 8 Aug 2021 19:49:34 +0900 Subject: [PATCH v4] Fix comments in publication.sql and parsenodes.h --- src/include/nodes/parsenodes.h | 4 ++-- src/test/regress/expected/publication.out | 6 ++---- src/test/regress/sql/publication.sql | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index e28248af32..788c73a2ca 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -3642,8 +3642,8 @@ typedef struct AlterPublicationStmt /* parameters used for ALTER PUBLICATION ... WITH */ List *options; /* List of DefElem nodes */ - /* parameters used for ALTER PUBLICATION ... ADD/DROP TABLE */ - List *tables; /* List of tables to add/drop */ + /* parameters used for ALTER PUBLICATION ... ADD/DROP/SET TABLE */ + List *tables; /* List of tables to add/drop/set */ bool for_all_tables; /* Special publication for all tables in db */ DefElemAction tableAction; /* What action to perform with the tables */ } AlterPublicationStmt; diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out index 4a5ef0bc24..d5cc68e6b6 100644 --- a/src/test/regress/expected/publication.out +++ b/src/test/regress/expected/publication.out @@ -57,15 +57,13 @@ CREATE PUBLICATION testpub_foralltables FOR ALL TABLES WITH (publish = 'insert') RESET client_min_messages; ALTER PUBLICATION testpub_foralltables SET (publish = 'insert, update'); CREATE TABLE testpub_tbl2 (id serial primary key, data text); --- fail - can't add to for all tables publication +-- fail - tables can't be added, dropped or set to FOR ALL TABLES publications ALTER PUBLICATION testpub_foralltables ADD TABLE testpub_tbl2; ERROR: publication "testpub_foralltables" is defined as FOR ALL TABLES DETAIL: Tables cannot be added to or dropped from FOR ALL TABLES publications. --- fail - can't drop from all tables publication ALTER PUBLICATION testpub_foralltables DROP TABLE testpub_tbl2; ERROR: publication "testpub_foralltables" is defined as FOR ALL TABLES DETAIL: Tables cannot be added to or dropped from FOR ALL TABLES publications. --- fail - can't add to for all tables publication ALTER PUBLICATION testpub_foralltables SET TABLE pub_test.testpub_nopk; ERROR: publication "testpub_foralltables" is defined as FOR ALL TABLES DETAIL: Tables cannot be added to or dropped from FOR ALL TABLES publications. @@ -168,7 +166,7 @@ RESET client_min_messages; -- fail - already added ALTER PUBLICATION testpub_fortbl ADD TABLE testpub_tbl1; ERROR: relation "testpub_tbl1" is already member of publication "testpub_fortbl" --- fail - already added +-- fail - already existing publication CREATE PUBLICATION testpub_fortbl FOR TABLE testpub_tbl1; ERROR: publication "testpub_fortbl" already exists \dRp+ testpub_fortbl diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql index d844075368..f1907aad17 100644 --- a/src/test/regress/sql/publication.sql +++ b/src/test/regress/sql/publication.sql @@ -44,11 +44,9 @@ RESET client_min_messages; ALTER PUBLICATION testpub_foralltables SET (publish = 'insert, update'); CREATE TABLE testpub_tbl2 (id serial primary key, data text); --- fail - can't add to for all tables publication +-- fail - tables can't be added, dropped or set to FOR ALL TABLES publications ALTER PUBLICATION testpub_foralltables ADD TABLE testpub_tbl2; --- fail - can't drop from all tables publication ALTER PUBLICATION testpub_foralltables DROP TABLE testpub_tbl2; --- fail - can't add to for all tables publication ALTER PUBLICATION testpub_foralltables SET TABLE pub_test.testpub_nopk; SELECT pubname, puballtables FROM pg_publication WHERE pubname = 'testpub_foralltables'; @@ -100,7 +98,7 @@ CREATE PUBLICATION testpub_fortbl FOR TABLE testpub_tbl1, pub_test.testpub_nopk; RESET client_min_messages; -- fail - already added ALTER PUBLICATION testpub_fortbl ADD TABLE testpub_tbl1; --- fail - already added +-- fail - already existing publication CREATE PUBLICATION testpub_fortbl FOR TABLE testpub_tbl1; \dRp+ testpub_fortbl -- 2.31.1.windows.1