From aad74e495848a42b434b011352554101d9a93b26 Mon Sep 17 00:00:00 2001 From: Shlok Kyal Date: Wed, 25 Feb 2026 21:02:46 +0530 Subject: [PATCH v50 2/3] Support SET EXCEPT TABLE in ALTER PUBLICATION Extend ALTER PUBLICATION to support SET EXCEPT TABLE for publications defined with FOR ALL TABLES. --- doc/src/sgml/ref/alter_publication.sgml | 23 ++++--- src/backend/commands/publicationcmds.c | 60 ++++++++++++------ src/backend/parser/gram.y | 77 +++++++++++++++++++---- src/bin/psql/tab-complete.in.c | 6 +- src/test/regress/expected/publication.out | 36 +++++++++++ src/test/regress/sql/publication.sql | 24 +++++++ 6 files changed, 183 insertions(+), 43 deletions(-) diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml index 028770f2149..fefc4fcbf6d 100644 --- a/doc/src/sgml/ref/alter_publication.sgml +++ b/doc/src/sgml/ref/alter_publication.sgml @@ -21,18 +21,24 @@ PostgreSQL documentation -ALTER PUBLICATION name ADD publication_object [, ...] -ALTER PUBLICATION name SET publication_object [, ...] +ALTER PUBLICATION name ADD publication_add_object [, ...] +ALTER PUBLICATION name SET publication_set_object [, ...] ALTER PUBLICATION name DROP publication_drop_object [, ...] ALTER PUBLICATION name SET ( publication_parameter [= value] [, ... ] ) ALTER PUBLICATION name OWNER TO { new_owner | CURRENT_ROLE | CURRENT_USER | SESSION_USER } ALTER PUBLICATION name RENAME TO new_name -where publication_object is one of: +where publication_add_object is one of: TABLE table_and_columns [, ... ] TABLES IN SCHEMA { schema_name | CURRENT_SCHEMA } [, ... ] +where publication_set_object is one of: + + EXCEPT TABLE [ ONLY ] table_name [, ... ] + TABLE table_and_columns [, ... ] + TABLES IN SCHEMA { schema_name | CURRENT_SCHEMA } [, ... ] + and publication_drop_object is one of: TABLE [ ONLY ] table_name [ * ] [, ... ] @@ -55,11 +61,12 @@ ALTER PUBLICATION name RENAME TO The first three variants change which tables/schemas are part of the publication. The SET clause will replace the list of - tables/schemas in the publication with the specified list; the existing - tables/schemas that were present in the publication will be removed. The - ADD and DROP clauses will add and - remove one or more tables/schemas from the publication. Note that adding - tables/schemas to a publication that is already subscribed to will require an + except tables/tables/schemas in the publication with the specified list; the + existing except tables/ tables/schemas that were present in the publication + will be removed. The ADD and DROP + clauses will add and remove one or more tables/schemas from the publication. + Note that adding tables/schemas to a publication that is already subscribed + to will require an ALTER SUBSCRIPTION ... REFRESH PUBLICATION action on the subscribing side in order to become effective. Note also that diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 2180cb866f4..dac8d13414e 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -181,7 +181,7 @@ parse_publication_options(ParseState *pstate, */ static void ObjectsInPublicationToOids(List *pubobjspec_list, ParseState *pstate, - List **rels, List **schemas) + List **rels, List **exceptrels, List **schemas) { ListCell *cell; PublicationObjSpec *pubobj; @@ -200,7 +200,7 @@ ObjectsInPublicationToOids(List *pubobjspec_list, ParseState *pstate, { case PUBLICATIONOBJ_EXCEPT_TABLE: pubobj->pubtable->except = true; - *rels = lappend(*rels, pubobj->pubtable); + *exceptrels = lappend(*exceptrels, pubobj->pubtable); break; case PUBLICATIONOBJ_TABLE: pubobj->pubtable->except = false; @@ -849,8 +849,8 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt) char publish_generated_columns; AclResult aclresult; List *relations = NIL; + List *exceptrelations = NIL; List *schemaidlist = NIL; - List *rels = NIL; /* must have CREATE privilege on database */ aclresult = object_aclcheck(DatabaseRelationId, MyDatabaseId, GetUserId(), ACL_CREATE); @@ -936,17 +936,16 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt) /* Associate objects with the publication. */ ObjectsInPublicationToOids(stmt->pubobjects, pstate, &relations, - &schemaidlist); - if (relations != NIL) - rels = OpenTableList(relations); + &exceptrelations, &schemaidlist); if (stmt->for_all_tables) { /* Process EXCEPT table list */ - if (relations != NIL) + if (exceptrelations != NIL) { - Assert(rels != NIL); - PublicationAddTables(puboid, rels, true, NULL); + exceptrelations = OpenTableList(exceptrelations); + PublicationAddTables(puboid, exceptrelations, true, NULL); + CloseTableList(exceptrelations); } /* @@ -966,6 +965,9 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt) if (relations != NIL) { + List *rels; + + rels = OpenTableList(relations); TransformPubWhereClauses(rels, pstate->p_sourcetext, publish_via_partition_root); @@ -974,6 +976,7 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt) publish_via_partition_root); PublicationAddTables(puboid, rels, true, NULL); + CloseTableList(rels); } if (schemaidlist != NIL) @@ -987,9 +990,6 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt) } } - if (rels != NIL) - CloseTableList(rels); - table_close(rel, RowExclusiveLock); InvokeObjectPostCreateHook(PublicationRelationId, puboid, 0); @@ -1270,15 +1270,24 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup, PublicationDropTables(pubid, rels, false); else /* AP_SetObjects */ { - List *oldrelids = GetIncludedPublicationRelations(pubid, - PUBLICATION_PART_ROOT); + bool isexcept = pubform->puballtables; + List *oldrelids; List *delrels = NIL; ListCell *oldlc; - TransformPubWhereClauses(rels, queryString, pubform->pubviaroot); + if (isexcept) + oldrelids = GetExcludedPublicationTables(pubid, + PUBLICATION_PART_ROOT); + else + { + oldrelids = GetIncludedPublicationRelations(pubid, + PUBLICATION_PART_ROOT); - CheckPubRelationColumnList(stmt->pubname, rels, publish_schema, - pubform->pubviaroot); + TransformPubWhereClauses(rels, queryString, pubform->pubviaroot); + + CheckPubRelationColumnList(stmt->pubname, rels, publish_schema, + pubform->pubviaroot); + } /* * To recreate the relation list for the publication, look for @@ -1486,7 +1495,7 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt, */ static void CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup, - List *tables, List *schemaidlist) + List *tables, List *excepttables, List *schemaidlist) { Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup); @@ -1544,6 +1553,14 @@ CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup, NameStr(pubform->pubname)), errdetail("Tables or sequences cannot be added to or dropped from FOR ALL SEQUENCES publications.")); } + + /* Check that user is allowed to manipulate the publication tables. */ + if (excepttables && !pubform->puballtables) + ereport(ERROR, + errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), + errmsg("publication \"%s\" is defined as NON FOR ALL TABLES", + NameStr(pubform->pubname)), + errdetail("EXCEPT Tables cannot be added to or dropped from non FOR ALL TABLES publications.")); } /* @@ -1582,13 +1599,15 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt) else { List *relations = NIL; + List *exceptrelations = NIL; List *schemaidlist = NIL; Oid pubid = pubform->oid; ObjectsInPublicationToOids(stmt->pubobjects, pstate, &relations, - &schemaidlist); + &exceptrelations, &schemaidlist); - CheckAlterPublication(stmt, tup, relations, schemaidlist); + CheckAlterPublication(stmt, tup, relations, exceptrelations, + schemaidlist); heap_freetuple(tup); @@ -1609,6 +1628,7 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt) errmsg("publication \"%s\" does not exist", stmt->pubname)); + relations = list_concat(relations, exceptrelations); AlterPublicationTables(stmt, tup, relations, pstate->p_sourcetext, schemaidlist != NIL); AlterPublicationSchemas(stmt, tup, schemaidlist); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 21ef7bee729..32ecbb1cf5a 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -207,7 +207,7 @@ static void preprocess_pub_all_objtype_list(List *all_objects_list, bool *all_tables, bool *all_sequences, core_yyscan_t yyscanner); -static void preprocess_pubobj_list(List *pubobjspec_list, +static bool preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner); static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); @@ -581,7 +581,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); Bit ConstBit BitWithLength BitWithoutLength %type character %type extract_arg -%type opt_varying opt_timezone opt_no_inherit +%type opt_varying opt_timezone opt_no_inherit opt_except %type Iconst SignedIconst %type Sconst comment_text notify_payload @@ -10830,16 +10830,28 @@ CreatePublicationStmt: } | CREATE PUBLICATION name FOR pub_obj_list opt_definition { + bool has_except_table; CreatePublicationStmt *n = makeNode(CreatePublicationStmt); n->pubname = $3; n->options = $6; n->pubobjects = (List *) $5; - preprocess_pubobj_list(n->pubobjects, yyscanner); + has_except_table = preprocess_pubobj_list(n->pubobjects, + yyscanner); + if (has_except_table) + ereport(ERROR, + errcode(ERRCODE_SYNTAX_ERROR), + errmsg("EXCEPT TABLE clause allowed only for ALL TABLES PUBLICATION")); + $$ = (Node *) n; } ; +opt_except: + EXCEPT { $$ = true; } + | /*EMPTY*/ { $$ = false; } + ; + /* * FOR TABLE and FOR TABLES IN SCHEMA specifications * @@ -10854,14 +10866,14 @@ CreatePublicationStmt: * relation_expr here. */ PublicationObjSpec: - TABLE relation_expr opt_column_list OptWhereClause + opt_except TABLE relation_expr opt_column_list OptWhereClause { $$ = makeNode(PublicationObjSpec); - $$->pubobjtype = PUBLICATIONOBJ_TABLE; + $$->pubobjtype = ($1) ? PUBLICATIONOBJ_EXCEPT_TABLE : PUBLICATIONOBJ_TABLE; $$->pubtable = makeNode(PublicationTable); - $$->pubtable->relation = $2; - $$->pubtable->columns = $3; - $$->pubtable->whereClause = $4; + $$->pubtable->relation = $3; + $$->pubtable->columns = $4; + $$->pubtable->whereClause = $5; } | TABLES IN_P SCHEMA ColId { @@ -11010,11 +11022,18 @@ AlterPublicationStmt: } | ALTER PUBLICATION name ADD_P pub_obj_list { + bool has_except_table = false; AlterPublicationStmt *n = makeNode(AlterPublicationStmt); n->pubname = $3; n->pubobjects = $5; - preprocess_pubobj_list(n->pubobjects, yyscanner); + has_except_table = preprocess_pubobj_list(n->pubobjects, + yyscanner); + if (has_except_table) + ereport(ERROR, + errcode(ERRCODE_SYNTAX_ERROR), + errmsg("EXCEPT TABLE clause allowed only for SET clause")); + n->action = AP_AddObjects; $$ = (Node *) n; } @@ -11030,11 +11049,18 @@ AlterPublicationStmt: } | ALTER PUBLICATION name DROP pub_obj_list { + bool has_except_table = false; AlterPublicationStmt *n = makeNode(AlterPublicationStmt); n->pubname = $3; n->pubobjects = $5; - preprocess_pubobj_list(n->pubobjects, yyscanner); + has_except_table = preprocess_pubobj_list(n->pubobjects, + yyscanner); + if (has_except_table) + ereport(ERROR, + errcode(ERRCODE_SYNTAX_ERROR), + errmsg("EXCEPT TABLE clause allowed only for SET clause")); + n->action = AP_DropObjects; $$ = (Node *) n; } @@ -19880,16 +19906,19 @@ preprocess_pub_all_objtype_list(List *all_objects_list, List **pubobjects, /* * Process pubobjspec_list to check for errors in any of the objects and * convert PUBLICATIONOBJ_CONTINUATION into appropriate PublicationObjSpecType. + * + * Return true if an EXCEPT table is found. */ -static void +static bool preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner) { ListCell *cell; PublicationObjSpec *pubobj; PublicationObjSpecType prevobjtype = PUBLICATIONOBJ_CONTINUATION; + bool foundexcepttable = false; if (!pubobjspec_list) - return; + return false; pubobj = (PublicationObjSpec *) linitial(pubobjspec_list); if (pubobj->pubobjtype == PUBLICATIONOBJ_CONTINUATION) @@ -19906,7 +19935,8 @@ preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner) if (pubobj->pubobjtype == PUBLICATIONOBJ_CONTINUATION) pubobj->pubobjtype = prevobjtype; - if (pubobj->pubobjtype == PUBLICATIONOBJ_TABLE) + if (pubobj->pubobjtype == PUBLICATIONOBJ_TABLE || + pubobj->pubobjtype == PUBLICATIONOBJ_EXCEPT_TABLE) { /* relation name or pubtable must be set for this type of object */ if (!pubobj->name && !pubobj->pubtable) @@ -19925,6 +19955,25 @@ preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner) pubobj->pubtable = pubtable; pubobj->name = NULL; } + + if (pubobj->pubobjtype == PUBLICATIONOBJ_EXCEPT_TABLE) + { + foundexcepttable = true; + + /* WHERE clause is not allowed on an except table */ + if (pubobj->pubtable->whereClause) + ereport(ERROR, + errcode(ERRCODE_SYNTAX_ERROR), + errmsg("WHERE clause not allowed for except table"), + parser_errposition(pubobj->location)); + + /* Column list is not allowed on a except table */ + if (pubobj->pubtable && pubobj->pubtable->columns) + ereport(ERROR, + errcode(ERRCODE_SYNTAX_ERROR), + errmsg("column specification not allowed for except table"), + parser_errposition(pubobj->location)); + } } else if (pubobj->pubobjtype == PUBLICATIONOBJ_TABLES_IN_SCHEMA || pubobj->pubobjtype == PUBLICATIONOBJ_TABLES_IN_CUR_SCHEMA) @@ -19960,6 +20009,8 @@ preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner) prevobjtype = pubobj->pubobjtype; } + + return foundexcepttable; } /*---------- diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c index 39404ea0f69..0fc16a3e110 100644 --- a/src/bin/psql/tab-complete.in.c +++ b/src/bin/psql/tab-complete.in.c @@ -2318,9 +2318,11 @@ match_previous_words(int pattern_id, /* ALTER PUBLICATION DROP */ else if (Matches("ALTER", "PUBLICATION", MatchAny, "DROP")) COMPLETE_WITH("TABLES IN SCHEMA", "TABLE"); - /* ALTER PUBLICATION SET */ + /* ALTER PUBLICATION SET */ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET")) - COMPLETE_WITH("(", "TABLES IN SCHEMA", "TABLE"); + COMPLETE_WITH("(", "EXCEPT", "TABLES IN SCHEMA", "TABLE"); + else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "EXCEPT")) + COMPLETE_WITH("TABLE"); else if (Matches("ALTER", "PUBLICATION", MatchAny, "ADD|DROP|SET", "TABLES", "IN", "SCHEMA")) COMPLETE_WITH_QUERY_PLUS(Query_for_list_of_schemas " AND nspname NOT LIKE E'pg\\\\_%%'", diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out index ae3bebc2b4b..9d092934e25 100644 --- a/src/test/regress/expected/publication.out +++ b/src/test/regress/expected/publication.out @@ -126,6 +126,16 @@ ALTER PUBLICATION testpub_fortable SET TABLES IN SCHEMA pub_test; Tables from schemas: "pub_test" +-- fail - can't add an EXCEPT TABLE to 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable ADD EXCEPT TABLE testpub_tbl1; +ERROR: EXCEPT TABLE clause allowed only for SET clause +-- fail - can't drop an EXCEPT TABLE from 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable DROP EXCEPT TABLE testpub_tbl1; +ERROR: EXCEPT TABLE clause allowed only for SET clause +-- fail - can't set an EXCEPT TABLE to 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable SET EXCEPT TABLE testpub_tbl1; +ERROR: publication "testpub_fortable" is defined as NON FOR ALL TABLES +DETAIL: EXCEPT Tables cannot be added to or dropped from non FOR ALL TABLES publications. SET client_min_messages = 'ERROR'; CREATE PUBLICATION testpub_forschema FOR TABLES IN SCHEMA pub_test; -- should be able to create publication with schema and table of the same @@ -213,6 +223,16 @@ Not-null constraints: regress_publication_user | t | f | t | t | f | f | none | f (1 row) +-- fail - can't add an EXCEPT TABLE to schema publication +ALTER PUBLICATION testpub_forschema ADD EXCEPT TABLE pub_test.testpub_nopk; +ERROR: EXCEPT TABLE clause allowed only for SET clause +-- fail - can't drop an EXCEPT TABLE from schema publication +ALTER PUBLICATION testpub_forschema DROP EXCEPT TABLE pub_test.testpub_nopk; +ERROR: EXCEPT TABLE clause allowed only for SET clause +-- fail - can't set an EXCEPT TABLE to schema publication +ALTER PUBLICATION testpub_forschema SET EXCEPT TABLE pub_test.testpub_nopk; +ERROR: publication "testpub_forschema" is defined as NON FOR ALL TABLES +DETAIL: EXCEPT Tables cannot be added to or dropped from non FOR ALL TABLES publications. --------------------------------------------- -- EXCEPT TABLE tests for normal tables --------------------------------------------- @@ -255,6 +275,22 @@ Except Publications: "testpub_foralltables_excepttable" "testpub_foralltables_excepttable1" +-- Replace the publication EXCEPT table list with a specific EXCEPT table. +ALTER PUBLICATION testpub_foralltables_excepttable SET EXCEPT TABLE testpub_tbl1; +\dRp+ testpub_foralltables_excepttable + Publication testpub_foralltables_excepttable + Owner | All tables | All sequences | Inserts | Updates | Deletes | Truncates | Generated columns | Via root +--------------------------+------------+---------------+---------+---------+---------+-----------+-------------------+---------- + regress_publication_user | t | f | t | t | t | t | none | f +Except tables: + "public.testpub_tbl1" + +-- fail - Dropping EXCEPT table is not supported. +ALTER PUBLICATION testpub_foralltables_excepttable DROP EXCEPT TABLE testpub_tbl1; +ERROR: EXCEPT TABLE clause allowed only for SET clause +-- fail - Adding EXCEPT table is not supported. +ALTER PUBLICATION testpub_foralltables_excepttable ADD EXCEPT TABLE testpub_tbl1; +ERROR: EXCEPT TABLE clause allowed only for SET clause RESET client_min_messages; DROP TABLE testpub_tbl2; DROP PUBLICATION testpub_foralltables, testpub_fortable, testpub_forschema, testpub_for_tbl_schema, testpub_foralltables_excepttable, testpub_foralltables_excepttable1; diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql index 31b9b7d4c54..2086539fdc2 100644 --- a/src/test/regress/sql/publication.sql +++ b/src/test/regress/sql/publication.sql @@ -74,6 +74,13 @@ ALTER PUBLICATION testpub_fortable DROP TABLES IN SCHEMA pub_test; ALTER PUBLICATION testpub_fortable SET TABLES IN SCHEMA pub_test; \dRp+ testpub_fortable +-- fail - can't add an EXCEPT TABLE to 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable ADD EXCEPT TABLE testpub_tbl1; +-- fail - can't drop an EXCEPT TABLE from 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable DROP EXCEPT TABLE testpub_tbl1; +-- fail - can't set an EXCEPT TABLE to 'FOR TABLE' publication +ALTER PUBLICATION testpub_fortable SET EXCEPT TABLE testpub_tbl1; + SET client_min_messages = 'ERROR'; CREATE PUBLICATION testpub_forschema FOR TABLES IN SCHEMA pub_test; -- should be able to create publication with schema and table of the same @@ -105,6 +112,13 @@ SELECT pubname, puballtables FROM pg_publication WHERE pubname = 'testpub_forall \d+ testpub_tbl2 \dRp+ testpub_foralltables +-- fail - can't add an EXCEPT TABLE to schema publication +ALTER PUBLICATION testpub_forschema ADD EXCEPT TABLE pub_test.testpub_nopk; +-- fail - can't drop an EXCEPT TABLE from schema publication +ALTER PUBLICATION testpub_forschema DROP EXCEPT TABLE pub_test.testpub_nopk; +-- fail - can't set an EXCEPT TABLE to schema publication +ALTER PUBLICATION testpub_forschema SET EXCEPT TABLE pub_test.testpub_nopk; + --------------------------------------------- -- EXCEPT TABLE tests for normal tables --------------------------------------------- @@ -120,6 +134,16 @@ CREATE PUBLICATION testpub_foralltables_excepttable1 FOR ALL TABLES EXCEPT (test -- in the EXCEPT clause \d testpub_tbl1 +-- Replace the publication EXCEPT table list with a specific EXCEPT table. +ALTER PUBLICATION testpub_foralltables_excepttable SET EXCEPT TABLE testpub_tbl1; +\dRp+ testpub_foralltables_excepttable + +-- fail - Dropping EXCEPT table is not supported. +ALTER PUBLICATION testpub_foralltables_excepttable DROP EXCEPT TABLE testpub_tbl1; + +-- fail - Adding EXCEPT table is not supported. +ALTER PUBLICATION testpub_foralltables_excepttable ADD EXCEPT TABLE testpub_tbl1; + RESET client_min_messages; DROP TABLE testpub_tbl2; DROP PUBLICATION testpub_foralltables, testpub_fortable, testpub_forschema, testpub_for_tbl_schema, testpub_foralltables_excepttable, testpub_foralltables_excepttable1; -- 2.34.1