v5-0003-Support-EXCEPT-for-ALL-SEQUENCES-in-ALTER-PUBLICA.patch
application/octet-stream
Filename: v5-0003-Support-EXCEPT-for-ALL-SEQUENCES-in-ALTER-PUBLICA.patch
Type: application/octet-stream
Part: 0
From 083e651a591dc1e3c7b9804bcf075a8269bd2970 Mon Sep 17 00:00:00 2001
From: Shlok Kyal <shlok.kyal.oss@gmail.com>
Date: Mon, 11 May 2026 10:59:28 +0530
Subject: [PATCH v5 3/3] Support EXCEPT for ALL SEQUENCES in ALTER PUBLICATION
Extend ALTER PUBLICATION to support an EXCEPT clause when using
ALL SEQUENCES, allowing specific sequences to be excluded from the
publication.
If the EXCEPT clause is specified, the existing exclusion list for the
publication is replaced with the provided sequences. If the EXCEPT
clause is omitted, any existing exclusions for sequences are cleared.
Example:
ALTER PUBLICATION pub1 SET ALL SEQUENCES;
This clears any existing sequence exclusions for the publication.
ALTER PUBLICATION pub1 SET ALL SEQUENCES EXCEPT (SEQUENCE s1, s2);
This sets the exclusion list to the specified sequences.
---
doc/src/sgml/ref/alter_publication.sgml | 22 +-
src/backend/catalog/pg_publication.c | 23 +-
src/backend/commands/publicationcmds.c | 253 ++++++++++++----------
src/bin/psql/tab-complete.in.c | 14 ++
src/include/catalog/pg_publication.h | 3 +-
src/test/regress/expected/publication.out | 16 ++
src/test/regress/sql/publication.sql | 5 +
7 files changed, 201 insertions(+), 135 deletions(-)
diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml
index aa32bb169e9..3ce1d5d1539 100644
--- a/doc/src/sgml/ref/alter_publication.sgml
+++ b/doc/src/sgml/ref/alter_publication.sgml
@@ -36,7 +36,7 @@ ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <r
<phrase>and <replaceable class="parameter">publication_all_object</replaceable> is one of:</phrase>
ALL TABLES [ EXCEPT ( <replaceable class="parameter">except_table_object</replaceable> [, ... ] ) ]
- ALL SEQUENCES
+ ALL SEQUENCES [ EXCEPT ( <replaceable class="parameter">except_sequence_object</replaceable> [, ... ] ) ]
<phrase>and <replaceable class="parameter">publication_drop_object</replaceable> is one of:</phrase>
@@ -54,6 +54,10 @@ ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <r
<phrase>and <replaceable class="parameter">table_object</replaceable> is:</phrase>
[ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
+
+<phrase>and <replaceable class="parameter">except_sequence_object</replaceable> is:</phrase>
+
+ SEQUENCE <replaceable class="parameter">sequence_name</replaceable> [, ... ]
</synopsis>
</refsynopsisdiv>
@@ -75,7 +79,7 @@ ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <r
The third variant either modifies the included tables/schemas
or marks the publication as <literal>FOR ALL SEQUENCES</literal> or
<literal>FOR ALL TABLES</literal>, optionally using
- <literal>EXCEPT</literal> to exclude specific tables. The
+ <literal>EXCEPT</literal> to exclude specific tables or sequences. The
<literal>SET ALL TABLES</literal> clause can transform an empty publication,
or one defined for <literal>ALL SEQUENCES</literal> (or both
<literal>ALL TABLES</literal> and <literal>ALL SEQUENCES</literal>), into
@@ -86,11 +90,15 @@ ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <r
publication defined for <literal>ALL SEQUENCES</literal>. In addition,
<literal>SET ALL TABLES</literal> can be used to update the tables specified
in the <literal>EXCEPT</literal> clause of a
- <literal>FOR ALL TABLES</literal> publication. If <literal>EXCEPT</literal>
- is specified with a list of tables, the existing exclusion list is replaced
- with the specified tables. If <literal>EXCEPT</literal> is omitted, the
- existing exclusion list is cleared. The <literal>SET</literal> clause, when
- used with a publication defined with <literal>FOR TABLE</literal> or
+ <literal>FOR ALL TABLES</literal> publication and
+ <literal>SET ALL SEQUENCES</literal> can be used to update the sequences
+ specified in the <literal>EXCEPT</literal> clause of a
+ <literal>FOR ALL SEQUENCES</literal> publication. If
+ <literal>EXCEPT</literal> is specified with a list of tables or sequences,
+ the existing exclusion list is replaced with the specified tables or
+ sequences. If <literal>EXCEPT</literal> is omitted, the existing exclusion
+ list is cleared. The <literal>SET</literal> clause, when used with a
+ publication defined with <literal>FOR TABLE</literal> or
<literal>FOR TABLES IN SCHEMA</literal>, replaces the list of tables/schemas
in the publication with the specified list; the existing tables or schemas
that were present in the publication will be removed.
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index de264dbed2b..375cec6e2c5 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -946,7 +946,7 @@ GetRelationExcludedPublications(Oid relid)
*/
static List *
get_publication_relations(Oid pubid, PublicationPartOpt pub_partopt,
- bool except_flag)
+ bool except_flag, char pubrelkind)
{
List *result;
Relation pubrelsrel;
@@ -973,8 +973,15 @@ get_publication_relations(Oid pubid, PublicationPartOpt pub_partopt,
pubrel = (Form_pg_publication_rel) GETSTRUCT(tup);
if (except_flag == pubrel->prexcept)
- result = GetPubPartitionOptionRelations(result, pub_partopt,
- pubrel->prrelid);
+ {
+ char relkind = get_rel_relkind(pubrel->prrelid);
+
+ if ((pubrelkind == RELKIND_RELATION && relkind == RELKIND_RELATION) ||
+ (pubrelkind == RELKIND_RELATION && relkind == RELKIND_PARTITIONED_TABLE) ||
+ (pubrelkind == RELKIND_SEQUENCE && relkind == RELKIND_SEQUENCE))
+ result = GetPubPartitionOptionRelations(result, pub_partopt,
+ pubrel->prrelid);
+ }
}
systable_endscan(scan);
@@ -998,7 +1005,7 @@ GetIncludedPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt)
{
Assert(!GetPublication(pubid)->alltables);
- return get_publication_relations(pubid, pub_partopt, false);
+ return get_publication_relations(pubid, pub_partopt, false, RELKIND_RELATION);
}
/*
@@ -1006,12 +1013,13 @@ GetIncludedPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt)
* 'FOR ALL TABLES' or a 'FOR ALL SEQUENCES' publication.
*/
List *
-GetExcludedPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt)
+GetExcludedPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt,
+ char pubrelkind)
{
Assert(GetPublication(pubid)->alltables ||
GetPublication(pubid)->allsequences);
- return get_publication_relations(pubid, pub_partopt, true);
+ return get_publication_relations(pubid, pub_partopt, true, pubrelkind);
}
/*
@@ -1079,7 +1087,8 @@ GetAllPublicationRelations(Oid pubid, char relkind, bool pubviaroot)
/* EXCEPT filtering applies to tables and sequences */
exceptlist = GetExcludedPublicationRelations(pubid, pubviaroot ?
PUBLICATION_PART_ROOT :
- PUBLICATION_PART_LEAF);
+ PUBLICATION_PART_LEAF,
+ relkind);
classRel = table_open(RelationRelationId, AccessShareLock);
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index e97578ddd75..3bfc94ebeae 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -66,7 +66,7 @@ static void CloseRelationList(List *rels);
static void LockSchemaList(List *schemalist);
static void PublicationAddRelations(Oid pubid, List *rels, bool if_not_exists,
AlterPublicationStmt *stmt, char pubrelkind);
-static void PublicationDropTables(Oid pubid, List *rels, bool missing_ok);
+static void PublicationDropRelations(Oid pubid, List *rels, bool missing_ok);
static void PublicationAddSchemas(Oid pubid, List *schemas, bool if_not_exists,
AlterPublicationStmt *stmt);
static void PublicationDropSchemas(Oid pubid, List *schemas, bool missing_ok);
@@ -1251,14 +1251,118 @@ InvalidatePublicationRels(List *relids)
}
/*
- * Add or remove table to/from publication.
+ * Recreate list of tables/sequences to be dropped from the publication.
+ * To recreate the relation list for the publication, look for existing
+ * relations that do not need to be dropped.
*/
static void
-AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
- List *tables, const char *queryString,
- bool publish_schema)
+get_delete_rels(Oid pubid, List *rels, List *oldrelids, List **delrels)
+{
+ foreach_oid(oldrelid, oldrelids)
+ {
+ ListCell *newlc;
+ PublicationRelInfo *oldrel;
+ bool found = false;
+ HeapTuple rftuple;
+ Node *oldrelwhereclause = NULL;
+ Bitmapset *oldcolumns = NULL;
+
+ /* look up the cache for the old relmap */
+ rftuple = SearchSysCache2(PUBLICATIONRELMAP,
+ ObjectIdGetDatum(oldrelid),
+ ObjectIdGetDatum(pubid));
+
+ /*
+ * See if the existing relation currently has a WHERE clause or a
+ * column list. We need to compare those too.
+ */
+ if (HeapTupleIsValid(rftuple))
+ {
+ bool isnull = true;
+ Datum whereClauseDatum;
+ Datum columnListDatum;
+
+ /* Load the WHERE clause for this table. */
+ whereClauseDatum = SysCacheGetAttr(PUBLICATIONRELMAP, rftuple,
+ Anum_pg_publication_rel_prqual,
+ &isnull);
+ if (!isnull)
+ oldrelwhereclause = stringToNode(TextDatumGetCString(whereClauseDatum));
+
+ /* Transform the int2vector column list to a bitmap. */
+ columnListDatum = SysCacheGetAttr(PUBLICATIONRELMAP, rftuple,
+ Anum_pg_publication_rel_prattrs,
+ &isnull);
+
+ if (!isnull)
+ oldcolumns = pub_collist_to_bitmapset(NULL, columnListDatum, NULL);
+
+ ReleaseSysCache(rftuple);
+ }
+
+ foreach(newlc, rels)
+ {
+ PublicationRelInfo *newpubrel;
+ Oid newrelid;
+ Bitmapset *newcolumns = NULL;
+
+ newpubrel = (PublicationRelInfo *) lfirst(newlc);
+ newrelid = RelationGetRelid(newpubrel->relation);
+
+ /*
+ * Validate the column list. If the column list or WHERE clause
+ * changes, then the validation done here will be duplicated
+ * inside PublicationAddRelations(). The validation is cheap
+ * enough that that seems harmless.
+ */
+ newcolumns = pub_collist_validate(newpubrel->relation,
+ newpubrel->columns);
+
+ /*
+ * Check if any of the new set of relations matches with the
+ * existing relations in the publication. Additionally, if the
+ * relation has an associated WHERE clause, check the WHERE
+ * expressions also match. Same for the column list. Drop the
+ * rest.
+ */
+ if (newrelid == oldrelid)
+ {
+ if (equal(oldrelwhereclause, newpubrel->whereClause) &&
+ bms_equal(oldcolumns, newcolumns))
+ {
+ found = true;
+ break;
+ }
+ }
+ }
+
+ /*
+ * Add the non-matched relations to a list so that they can be
+ * dropped.
+ */
+ if (!found)
+ {
+ oldrel = palloc_object(PublicationRelInfo);
+ oldrel->whereClause = NULL;
+ oldrel->columns = NIL;
+ oldrel->except = false;
+ oldrel->relation = table_open(oldrelid,
+ ShareUpdateExclusiveLock);
+ *delrels = lappend(*delrels, oldrel);
+ }
+ }
+}
+
+/*
+ * Add or remove table or sequence to/from publication.
+ */
+static void
+AlterPublicationRelations(AlterPublicationStmt *stmt, HeapTuple tup,
+ List *tables, List *sequences, const char *queryString,
+ bool publish_schema)
{
List *rels = NIL;
+ List *seqs = NIL;
Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup);
Oid pubid = pubform->oid;
@@ -1271,6 +1375,7 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
return;
rels = OpenRelationList(tables);
+ seqs = OpenRelationList(sequences);
if (stmt->action == AP_AddObjects)
{
@@ -1284,29 +1389,33 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
PublicationAddRelations(pubid, rels, false, stmt, RELKIND_RELATION);
}
else if (stmt->action == AP_DropObjects)
- PublicationDropTables(pubid, rels, false);
+ PublicationDropRelations(pubid, rels, false);
else /* AP_SetObjects */
{
List *oldrelids = NIL;
+ List *oldseqids = NIL;
List *delrels = NIL;
- ListCell *oldlc;
if (stmt->for_all_tables || stmt->for_all_sequences)
{
/*
- * In FOR ALL TABLES mode, relations are tracked as exclusions
- * (EXCEPT clause). Fetch the current excluded relations so they
- * can be reconciled with the specified EXCEPT list.
+ * In FOR ALL TABLES/ SEQUENCES mode, relations are tracked as
+ * exclusions (EXCEPT clause). Fetch the current excluded
+ * relations so they can be reconciled with the specified EXCEPT
+ * list.
*
* This applies only if the existing publication is already
- * defined as FOR ALL TABLES; otherwise, there are no exclusion
- * entries to process.
+ * defined as FOR ALL TABLES/ FOR ALL SEQUENCES; otherwise, there
+ * are no exclusion entries to process.
*/
if (pubform->puballtables)
- {
oldrelids = GetExcludedPublicationRelations(pubid,
- PUBLICATION_PART_ROOT);
- }
+ PUBLICATION_PART_ROOT,
+ RELKIND_RELATION);
+ if (pubform->puballsequences)
+ oldseqids = GetExcludedPublicationRelations(pubid,
+ PUBLICATION_PART_ROOT,
+ RELKIND_SEQUENCE);
}
else
{
@@ -1319,117 +1428,24 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
pubform->pubviaroot);
}
- /*
- * To recreate the relation list for the publication, look for
- * existing relations that do not need to be dropped.
- */
- foreach(oldlc, oldrelids)
- {
- Oid oldrelid = lfirst_oid(oldlc);
- ListCell *newlc;
- PublicationRelInfo *oldrel;
- bool found = false;
- HeapTuple rftuple;
- Node *oldrelwhereclause = NULL;
- Bitmapset *oldcolumns = NULL;
-
- /* look up the cache for the old relmap */
- rftuple = SearchSysCache2(PUBLICATIONRELMAP,
- ObjectIdGetDatum(oldrelid),
- ObjectIdGetDatum(pubid));
-
- /*
- * See if the existing relation currently has a WHERE clause or a
- * column list. We need to compare those too.
- */
- if (HeapTupleIsValid(rftuple))
- {
- bool isnull = true;
- Datum whereClauseDatum;
- Datum columnListDatum;
-
- /* Load the WHERE clause for this table. */
- whereClauseDatum = SysCacheGetAttr(PUBLICATIONRELMAP, rftuple,
- Anum_pg_publication_rel_prqual,
- &isnull);
- if (!isnull)
- oldrelwhereclause = stringToNode(TextDatumGetCString(whereClauseDatum));
-
- /* Transform the int2vector column list to a bitmap. */
- columnListDatum = SysCacheGetAttr(PUBLICATIONRELMAP, rftuple,
- Anum_pg_publication_rel_prattrs,
- &isnull);
-
- if (!isnull)
- oldcolumns = pub_collist_to_bitmapset(NULL, columnListDatum, NULL);
-
- ReleaseSysCache(rftuple);
- }
-
- foreach(newlc, rels)
- {
- PublicationRelInfo *newpubrel;
- Oid newrelid;
- Bitmapset *newcolumns = NULL;
-
- newpubrel = (PublicationRelInfo *) lfirst(newlc);
- newrelid = RelationGetRelid(newpubrel->relation);
-
- /*
- * Validate the column list. If the column list or WHERE
- * clause changes, then the validation done here will be
- * duplicated inside PublicationAddRelations(). The
- * validation is cheap enough that that seems harmless.
- */
- newcolumns = pub_collist_validate(newpubrel->relation,
- newpubrel->columns);
-
- /*
- * Check if any of the new set of relations matches with the
- * existing relations in the publication. Additionally, if the
- * relation has an associated WHERE clause, check the WHERE
- * expressions also match. Same for the column list. Drop the
- * rest.
- */
- if (newrelid == oldrelid)
- {
- if (equal(oldrelwhereclause, newpubrel->whereClause) &&
- bms_equal(oldcolumns, newcolumns))
- {
- found = true;
- break;
- }
- }
- }
-
- /*
- * Add the non-matched relations to a list so that they can be
- * dropped.
- */
- if (!found)
- {
- oldrel = palloc_object(PublicationRelInfo);
- oldrel->whereClause = NULL;
- oldrel->columns = NIL;
- oldrel->except = false;
- oldrel->relation = table_open(oldrelid,
- ShareUpdateExclusiveLock);
- delrels = lappend(delrels, oldrel);
- }
- }
+ /* Get tables and sequences to be dropped */
+ get_delete_rels(pubid, rels, oldrelids, &delrels);
+ get_delete_rels(pubid, seqs, oldseqids, &delrels);
/* And drop them. */
- PublicationDropTables(pubid, delrels, true);
+ PublicationDropRelations(pubid, delrels, true);
/*
* Don't bother calculating the difference for adding, we'll catch and
* skip existing ones when doing catalog update.
*/
PublicationAddRelations(pubid, rels, true, stmt, RELKIND_RELATION);
+ PublicationAddRelations(pubid, seqs, true, stmt, RELKIND_SEQUENCE);
CloseRelationList(delrels);
}
+ CloseRelationList(seqs);
CloseRelationList(rels);
}
@@ -1706,9 +1722,6 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt)
ObjectsInPublicationToOids(stmt->pubobjects, pstate, &relations,
&excepttbls, &exceptseqs, &schemaidlist);
- /* EXCEPT clause is not supported with ALTER PUBLICATION */
- Assert(exceptseqs == NIL);
-
CheckAlterPublication(stmt, tup, relations, schemaidlist);
heap_freetuple(tup);
@@ -1731,8 +1744,8 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt)
stmt->pubname));
relations = list_concat(relations, excepttbls);
- AlterPublicationTables(stmt, tup, relations, pstate->p_sourcetext,
- schemaidlist != NIL);
+ AlterPublicationRelations(stmt, tup, relations, exceptseqs,
+ pstate->p_sourcetext, schemaidlist != NIL);
AlterPublicationSchemas(stmt, tup, schemaidlist);
AlterPublicationAllFlags(stmt, rel, tup);
}
@@ -2090,7 +2103,7 @@ PublicationAddRelations(Oid pubid, List *rels, bool if_not_exists,
* Remove listed tables from the publication.
*/
static void
-PublicationDropTables(Oid pubid, List *rels, bool missing_ok)
+PublicationDropRelations(Oid pubid, List *rels, bool missing_ok)
{
ObjectAddress obj;
ListCell *lc;
diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index 96b50ea105c..e5424d9732f 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -2350,6 +2350,20 @@ match_previous_words(int pattern_id,
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables);
else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "TABLES", "EXCEPT", "(", "TABLE", MatchAnyN) && !ends_with(prev_wd, ','))
COMPLETE_WITH(")");
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT", "("))
+ COMPLETE_WITH("SEQUENCE");
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES"))
+ COMPLETE_WITH("EXCEPT ( SEQUENCE");
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT"))
+ COMPLETE_WITH("( SEQUENCE");
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT", "("))
+ COMPLETE_WITH("SEQUENCE");
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT", "(", "SEQUENCE"))
+ COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_sequences);
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT", "(", "SEQUENCE", MatchAnyN) && ends_with(prev_wd, ','))
+ COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_sequences);
+ else if (Matches("ALTER", "PUBLICATION", MatchAny, "SET", "ALL", "SEQUENCES", "EXCEPT", "(", "SEQUENCE", MatchAnyN) && !ends_with(prev_wd, ','))
+ COMPLETE_WITH(")");
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/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 49c29a87630..e8e6baa6c40 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -178,7 +178,8 @@ typedef enum PublicationPartOpt
extern List *GetIncludedPublicationRelations(Oid pubid,
PublicationPartOpt pub_partopt);
extern List *GetExcludedPublicationRelations(Oid pubid,
- PublicationPartOpt pub_partopt);
+ PublicationPartOpt pub_partopt,
+ char pubrelkind);
extern List *GetAllTablesPublications(void);
extern List *GetAllPublicationRelations(Oid pubid, char relkind, bool pubviaroot);
extern List *GetPublicationSchemas(Oid pubid);
diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index 15c30ffeefc..26b2f57fd4f 100644
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -562,16 +562,32 @@ Included in publications:
Excluded from publications:
"regress_pub_forallsequences3"
+-- Modify the sequence list in the EXCEPT clause
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL SEQUENCES EXCEPT (SEQUENCE regress_pub_seq0);
+\dRp+ regress_pub_forallsequences3
+ Publication regress_pub_forallsequences3
+ Owner | All tables | All sequences | Inserts | Updates | Deletes | Truncates | Generated columns | Via root | Description
+--------------------------+------------+---------------+---------+---------+---------+-----------+-------------------+----------+-------------
+ regress_publication_user | f | t | t | t | t | t | none | f |
+Except sequences:
+ "public.regress_pub_seq0"
+
RESET client_min_messages;
-- fail - sequence object is specified in EXCEPT table list
CREATE PUBLICATION regress_pub_forallsequences4 FOR ALL TABLES EXCEPT (TABLE regress_pub_seq0);
ERROR: cannot specify "public.regress_pub_seq0" in the publication EXCEPT (TABLE) clause
DETAIL: This operation is not supported for sequences.
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL TABLES EXCEPT (TABLE regress_pub_seq0);
+ERROR: cannot specify "public.regress_pub_seq0" in the publication EXCEPT (TABLE) clause
+DETAIL: This operation is not supported for sequences.
-- fail - table object is specified in EXCEPT sequence list
CREATE TABLE tab_seq(a int);
CREATE PUBLICATION regress_pub_forallsequences4 FOR ALL SEQUENCES EXCEPT (SEQUENCE tab_seq);
ERROR: cannot specify "public.tab_seq" in the publication EXCEPT (SEQUENCE) clause
DETAIL: This operation is not supported for tables.
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL SEQUENCES EXCEPT (SEQUENCE tab_seq);
+ERROR: cannot specify "public.tab_seq" in the publication EXCEPT (SEQUENCE) clause
+DETAIL: This operation is not supported for tables.
-- Test combination of ALL SEQUENCES and ALL TABLES with EXCEPT clause
SET client_min_messages = 'ERROR';
CREATE PUBLICATION regress_pub_for_allsequences_alltables1 FOR ALL TABLES EXCEPT (TABLE testpub_tbl1), ALL SEQUENCES EXCEPT (SEQUENCE regress_pub_seq0);
diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql
index d472553c7cd..998ae3e4e4f 100644
--- a/src/test/regress/sql/publication.sql
+++ b/src/test/regress/sql/publication.sql
@@ -261,14 +261,19 @@ CREATE PUBLICATION regress_pub_forallsequences3 FOR ALL SEQUENCES EXCEPT (SEQUEN
-- Check that the sequence description shows the publications where it is listed
-- in the EXCEPT clause
\d+ regress_pub_seq0
+-- Modify the sequence list in the EXCEPT clause
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL SEQUENCES EXCEPT (SEQUENCE regress_pub_seq0);
+\dRp+ regress_pub_forallsequences3
RESET client_min_messages;
-- fail - sequence object is specified in EXCEPT table list
CREATE PUBLICATION regress_pub_forallsequences4 FOR ALL TABLES EXCEPT (TABLE regress_pub_seq0);
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL TABLES EXCEPT (TABLE regress_pub_seq0);
-- fail - table object is specified in EXCEPT sequence list
CREATE TABLE tab_seq(a int);
CREATE PUBLICATION regress_pub_forallsequences4 FOR ALL SEQUENCES EXCEPT (SEQUENCE tab_seq);
+ALTER PUBLICATION regress_pub_forallsequences3 SET ALL SEQUENCES EXCEPT (SEQUENCE tab_seq);
-- Test combination of ALL SEQUENCES and ALL TABLES with EXCEPT clause
SET client_min_messages = 'ERROR';
--
2.34.1