Revert "Logical decoding of sequences"

This reverts a sequence of commits, implementing features related to logical decoding and replication of sequences: - 0da92dc530 - 80901b3291 - b779d7d8fd - d5ed9da41d - a180c2b34d - 75b1521dae - 2d2232933b - 002c9dd97a - 05843b1aa4 The implementation has issues, mostly due to combining transactional and non-transactional behavior of sequences. It's not clear how this could be fixed, but it'll require reworking significant part of the patch. Discussion: https://postgr.es/m/95345a19-d508-63d1-860a-f5c2f41e8d40@enterprisedb.com
2025-10-27 00:12:01 +03:00 · 2022-04-07 18:13:13 +02:00
parent d7ab2a9a3c
commit 2c7ea57e56
73 changed files with 605 additions and 4762 deletions
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -16,7 +16,6 @@

 #include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/relation.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
@@ -68,17 +67,15 @@ typedef struct rf_context
 } rf_context;

 static List *OpenRelIdList(List *relids);
-static List *OpenRelationList(List *rels, char objectType);
-static void CloseRelationList(List *rels);
+static List *OpenTableList(List *tables);
+static void CloseTableList(List *rels);
 static void LockSchemaList(List *schemalist);
-static void PublicationAddRelations(Oid pubid, List *rels, bool if_not_exists,
+static void PublicationAddTables(Oid pubid, List *rels, bool if_not_exists,
 								 AlterPublicationStmt *stmt);
-static void PublicationDropRelations(Oid pubid, List *rels, bool missing_ok);
-static void PublicationAddSchemas(Oid pubid, List *schemas, char objectType,
-								  bool if_not_exists, AlterPublicationStmt *stmt);
-static void PublicationDropSchemas(Oid pubid, List *schemas, char objectType,
-								   bool missing_ok);
-
+static void PublicationDropTables(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);

 static void
 parse_publication_options(ParseState *pstate,
@@ -98,7 +95,6 @@ parse_publication_options(ParseState *pstate,
 	pubactions->pubupdate = true;
 	pubactions->pubdelete = true;
 	pubactions->pubtruncate = true;
-	pubactions->pubsequence = true;
 	*publish_via_partition_root = false;

 	/* Parse options */
@@ -123,7 +119,6 @@ parse_publication_options(ParseState *pstate,
 			pubactions->pubupdate = false;
 			pubactions->pubdelete = false;
 			pubactions->pubtruncate = false;
-			pubactions->pubsequence = false;

 			*publish_given = true;
 			publish = defGetString(defel);
@@ -146,8 +141,6 @@ parse_publication_options(ParseState *pstate,
 					pubactions->pubdelete = true;
 				else if (strcmp(publish_opt, "truncate") == 0)
 					pubactions->pubtruncate = true;
-				else if (strcmp(publish_opt, "sequence") == 0)
-					pubactions->pubsequence = true;
 				else
 					ereport(ERROR,
 							(errcode(ERRCODE_SYNTAX_ERROR),
@@ -174,8 +167,7 @@ parse_publication_options(ParseState *pstate,
 */
 static void
 ObjectsInPublicationToOids(List *pubobjspec_list, ParseState *pstate,
-						   List **tables, List **sequences,
-						   List **tables_schemas, List **sequences_schemas)
+						   List **rels, List **schemas)
 {
 	ListCell   *cell;
 	PublicationObjSpec *pubobj;
@@ -193,22 +185,13 @@ ObjectsInPublicationToOids(List *pubobjspec_list, ParseState *pstate,
 		switch (pubobj->pubobjtype)
 		{
 			case PUBLICATIONOBJ_TABLE:
-				*tables = lappend(*tables, pubobj->pubtable);
-				break;
-			case PUBLICATIONOBJ_SEQUENCE:
-				*sequences = lappend(*sequences, pubobj->pubtable);
+				*rels = lappend(*rels, pubobj->pubtable);
 				break;
 			case PUBLICATIONOBJ_TABLES_IN_SCHEMA:
 				schemaid = get_namespace_oid(pubobj->name, false);

 				/* Filter out duplicates if user specifies "sch1, sch1" */
-				*tables_schemas = list_append_unique_oid(*tables_schemas, schemaid);
-				break;
-			case PUBLICATIONOBJ_SEQUENCES_IN_SCHEMA:
-				schemaid = get_namespace_oid(pubobj->name, false);
-
-				/* Filter out duplicates if user specifies "sch1, sch1" */
-				*sequences_schemas = list_append_unique_oid(*sequences_schemas, schemaid);
+				*schemas = list_append_unique_oid(*schemas, schemaid);
 				break;
 			case PUBLICATIONOBJ_TABLES_IN_CUR_SCHEMA:
 				search_path = fetch_search_path(false);
@@ -221,20 +204,7 @@ ObjectsInPublicationToOids(List *pubobjspec_list, ParseState *pstate,
 				list_free(search_path);

 				/* Filter out duplicates if user specifies "sch1, sch1" */
-				*tables_schemas = list_append_unique_oid(*tables_schemas, schemaid);
-				break;
-			case PUBLICATIONOBJ_SEQUENCES_IN_CUR_SCHEMA:
-				search_path = fetch_search_path(false);
-				if (search_path == NIL) /* nothing valid in search_path? */
-					ereport(ERROR,
-							errcode(ERRCODE_UNDEFINED_SCHEMA),
-							errmsg("no schema has been selected for CURRENT_SCHEMA"));
-
-				schemaid = linitial_oid(search_path);
-				list_free(search_path);
-
-				/* Filter out duplicates if user specifies "sch1, sch1" */
-				*sequences_schemas = list_append_unique_oid(*sequences_schemas, schemaid);
+				*schemas = list_append_unique_oid(*schemas, schemaid);
 				break;
 			default:
 				/* shouldn't happen */
@@ -270,14 +240,6 @@ CheckObjSchemaNotAlreadyInPublication(List *rels, List *schemaidlist,
 						errdetail("Table \"%s\" in schema \"%s\" is already part of the publication, adding the same schema is not supported.",
 								  RelationGetRelationName(rel),
 								  get_namespace_name(relSchemaId)));
-			else if (checkobjtype == PUBLICATIONOBJ_SEQUENCES_IN_SCHEMA)
-				ereport(ERROR,
-						errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						errmsg("cannot add schema \"%s\" to publication",
-							   get_namespace_name(relSchemaId)),
-						errdetail("Sequence \"%s\" in schema \"%s\" is already part of the publication, adding the same schema is not supported.",
-								  RelationGetRelationName(rel),
-								  get_namespace_name(relSchemaId)));
 			else if (checkobjtype == PUBLICATIONOBJ_TABLE)
 				ereport(ERROR,
 						errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -286,14 +248,6 @@ CheckObjSchemaNotAlreadyInPublication(List *rels, List *schemaidlist,
 							   RelationGetRelationName(rel)),
 						errdetail("Table's schema \"%s\" is already part of the publication or part of the specified schema list.",
 								  get_namespace_name(relSchemaId)));
-			else if (checkobjtype == PUBLICATIONOBJ_SEQUENCE)
-				ereport(ERROR,
-						errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						errmsg("cannot add relation \"%s.%s\" to publication",
-							   get_namespace_name(relSchemaId),
-							   RelationGetRelationName(rel)),
-						errdetail("Sequence's schema \"%s\" is already part of the publication or part of the specified schema list.",
-								  get_namespace_name(relSchemaId)));
 		}
 	}
 }
@@ -799,7 +753,6 @@ CheckPubRelationColumnList(List *tables, const char *queryString,
 ObjectAddress
 CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 {
-	ListCell   *lc;
 	Relation	rel;
 	ObjectAddress myself;
 	Oid			puboid;
@@ -811,23 +764,8 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 	bool		publish_via_partition_root_given;
 	bool		publish_via_partition_root;
 	AclResult	aclresult;
-	List	   *tables = NIL;
-	List	   *sequences = NIL;
-	List	   *tables_schemaidlist = NIL;
-	List	   *sequences_schemaidlist = NIL;
-
-	bool		for_all_tables = false;
-	bool		for_all_sequences = false;
-
-	/* Translate the list of object types (represented by strings) to bool flags. */
-	foreach (lc, stmt->for_all_objects)
-	{
-		char   *val = strVal(lfirst(lc));
-		if (strcmp(val, "tables") == 0)
-			for_all_tables = true;
-		else if (strcmp(val, "sequences") == 0)
-			for_all_sequences = true;
-	}
+	List	   *relations = NIL;
+	List	   *schemaidlist = NIL;

 	/* must have CREATE privilege on database */
 	aclresult = pg_database_aclcheck(MyDatabaseId, GetUserId(), ACL_CREATE);
@@ -836,17 +774,11 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 					   get_database_name(MyDatabaseId));

 	/* FOR ALL TABLES requires superuser */
-	if (for_all_tables && !superuser())
+	if (stmt->for_all_tables && !superuser())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be superuser to create FOR ALL TABLES publication")));

-	/* FOR ALL SEQUENCES requires superuser */
-	if (for_all_sequences && !superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to create FOR ALL SEQUENCES publication")));
-
 	rel = table_open(PublicationRelationId, RowExclusiveLock);

 	/* Check if name is used */
@@ -878,9 +810,7 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 								Anum_pg_publication_oid);
 	values[Anum_pg_publication_oid - 1] = ObjectIdGetDatum(puboid);
 	values[Anum_pg_publication_puballtables - 1] =
-		BoolGetDatum(for_all_tables);
-	values[Anum_pg_publication_puballsequences - 1] =
-		BoolGetDatum(for_all_sequences);
+		BoolGetDatum(stmt->for_all_tables);
 	values[Anum_pg_publication_pubinsert - 1] =
 		BoolGetDatum(pubactions.pubinsert);
 	values[Anum_pg_publication_pubupdate - 1] =
@@ -889,8 +819,6 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 		BoolGetDatum(pubactions.pubdelete);
 	values[Anum_pg_publication_pubtruncate - 1] =
 		BoolGetDatum(pubactions.pubtruncate);
-	values[Anum_pg_publication_pubsequence - 1] =
-		BoolGetDatum(pubactions.pubsequence);
 	values[Anum_pg_publication_pubviaroot - 1] =
 		BoolGetDatum(publish_via_partition_root);

@@ -908,42 +836,28 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 	CommandCounterIncrement();

 	/* Associate objects with the publication. */
-	if (for_all_tables || for_all_sequences)
+	if (stmt->for_all_tables)
 	{
 		/* Invalidate relcache so that publication info is rebuilt. */
 		CacheInvalidateRelcacheAll();
 	}
-
-	/*
-	 * If the publication might have either tables or sequences (directly or
-	 * through a schema), process that.
-	 */
-	if (!for_all_tables || !for_all_sequences)
+	else
 	{
-		ObjectsInPublicationToOids(stmt->pubobjects, pstate,
-								   &tables, &sequences,
-								   &tables_schemaidlist,
-								   &sequences_schemaidlist);
+		ObjectsInPublicationToOids(stmt->pubobjects, pstate, &relations,
+								   &schemaidlist);

 		/* FOR ALL TABLES IN SCHEMA requires superuser */
-		if (list_length(tables_schemaidlist) > 0 && !superuser())
+		if (list_length(schemaidlist) > 0 && !superuser())
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 					errmsg("must be superuser to create FOR ALL TABLES IN SCHEMA publication"));

-		/* FOR ALL SEQUENCES IN SCHEMA requires superuser */
-		if (list_length(sequences_schemaidlist) > 0 && !superuser())
-			ereport(ERROR,
-					errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					errmsg("must be superuser to create FOR ALL SEQUENCES IN SCHEMA publication"));
-
-		/* tables added directly */
-		if (list_length(tables) > 0)
+		if (list_length(relations) > 0)
 		{
 			List	   *rels;

-			rels = OpenRelationList(tables, PUB_OBJTYPE_TABLE);
-			CheckObjSchemaNotAlreadyInPublication(rels, tables_schemaidlist,
+			rels = OpenTableList(relations);
+			CheckObjSchemaNotAlreadyInPublication(rels, schemaidlist,
 												  PUBLICATIONOBJ_TABLE);

 			TransformPubWhereClauses(rels, pstate->p_sourcetext,
@@ -952,46 +866,18 @@ CreatePublication(ParseState *pstate, CreatePublicationStmt *stmt)
 			CheckPubRelationColumnList(rels, pstate->p_sourcetext,
 								   publish_via_partition_root);

-			PublicationAddRelations(puboid, rels, true, NULL);
-			CloseRelationList(rels);
+			PublicationAddTables(puboid, rels, true, NULL);
+			CloseTableList(rels);
 		}

-		/* sequences added directly */
-		if (list_length(sequences) > 0)
-		{
-			List	   *rels;
-
-			rels = OpenRelationList(sequences, PUB_OBJTYPE_SEQUENCE);
-			CheckObjSchemaNotAlreadyInPublication(rels, sequences_schemaidlist,
-												  PUBLICATIONOBJ_SEQUENCE);
-			PublicationAddRelations(puboid, rels, true, NULL);
-			CloseRelationList(rels);
-		}
-
-		/* tables added through a schema */
-		if (list_length(tables_schemaidlist) > 0)
+		if (list_length(schemaidlist) > 0)
 		{
 			/*
 			 * Schema lock is held until the publication is created to prevent
 			 * concurrent schema deletion.
 			 */
-			LockSchemaList(tables_schemaidlist);
-			PublicationAddSchemas(puboid,
-								  tables_schemaidlist, PUB_OBJTYPE_TABLE,
-								  true, NULL);
-		}
-
-		/* sequences added through a schema */
-		if (list_length(sequences_schemaidlist) > 0)
-		{
-			/*
-			 * Schema lock is held until the publication is created to prevent
-			 * concurrent schema deletion.
-			 */
-			LockSchemaList(sequences_schemaidlist);
-			PublicationAddSchemas(puboid,
-								  sequences_schemaidlist, PUB_OBJTYPE_SEQUENCE,
-								  true, NULL);
+			LockSchemaList(schemaidlist);
+			PublicationAddSchemas(puboid, schemaidlist, true, NULL);
 		}
 	}

@@ -1055,7 +941,6 @@ AlterPublicationOptions(ParseState *pstate, AlterPublicationStmt *stmt,
 						   AccessShareLock);

 		root_relids = GetPublicationRelations(pubform->oid,
-											  PUB_OBJTYPE_TABLE,
 											  PUBLICATION_PART_ROOT);

 		foreach(lc, root_relids)
@@ -1135,9 +1020,6 @@ AlterPublicationOptions(ParseState *pstate, AlterPublicationStmt *stmt,

 		values[Anum_pg_publication_pubtruncate - 1] = BoolGetDatum(pubactions.pubtruncate);
 		replaces[Anum_pg_publication_pubtruncate - 1] = true;
-
-		values[Anum_pg_publication_pubsequence - 1] = BoolGetDatum(pubactions.pubsequence);
-		replaces[Anum_pg_publication_pubsequence - 1] = true;
 	}

 	if (publish_via_partition_root_given)
@@ -1157,7 +1039,7 @@ AlterPublicationOptions(ParseState *pstate, AlterPublicationStmt *stmt,
 	pubform = (Form_pg_publication) GETSTRUCT(tup);

 	/* Invalidate the relcache. */
-	if (pubform->puballtables || pubform->puballsequences)
+	if (pubform->puballtables)
 	{
 		CacheInvalidateRelcacheAll();
 	}
@@ -1173,7 +1055,6 @@ AlterPublicationOptions(ParseState *pstate, AlterPublicationStmt *stmt,
 		 */
 		if (root_relids == NIL)
 			relids = GetPublicationRelations(pubform->oid,
-											 PUB_OBJTYPE_TABLE,
 											 PUBLICATION_PART_ALL);
 		else
 		{
@@ -1187,20 +1068,7 @@ AlterPublicationOptions(ParseState *pstate, AlterPublicationStmt *stmt,
 														lfirst_oid(lc));
 		}

-		/* tables */
 		schemarelids = GetAllSchemaPublicationRelations(pubform->oid,
-														PUB_OBJTYPE_TABLE,
-														PUBLICATION_PART_ALL);
-		relids = list_concat_unique_oid(relids, schemarelids);
-
-		/* sequences */
-		relids = list_concat_unique_oid(relids,
-										GetPublicationRelations(pubform->oid,
-											PUB_OBJTYPE_SEQUENCE,
-											PUBLICATION_PART_ALL));
-
-		schemarelids = GetAllSchemaPublicationRelations(pubform->oid,
-														PUB_OBJTYPE_SEQUENCE,
 														PUBLICATION_PART_ALL);
 		relids = list_concat_unique_oid(relids, schemarelids);

@@ -1255,7 +1123,7 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
 	if (!tables && stmt->action != AP_SetObjects)
 		return;

-	rels = OpenRelationList(tables, PUB_OBJTYPE_TABLE);
+	rels = OpenTableList(tables);

 	if (stmt->action == AP_AddObjects)
 	{
@@ -1265,9 +1133,7 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
 		 * Check if the relation is member of the existing schema in the
 		 * publication or member of the schema list specified.
 		 */
-		schemas = list_concat_copy(schemaidlist,
-								   GetPublicationSchemas(pubid,
-														 PUB_OBJTYPE_TABLE));
+		schemas = list_concat_copy(schemaidlist, GetPublicationSchemas(pubid));
 		CheckObjSchemaNotAlreadyInPublication(rels, schemas,
 											  PUBLICATIONOBJ_TABLE);

@@ -1275,14 +1141,13 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,

 		CheckPubRelationColumnList(rels, queryString, pubform->pubviaroot);

-		PublicationAddRelations(pubid, rels, false, stmt);
+		PublicationAddTables(pubid, rels, false, stmt);
 	}
 	else if (stmt->action == AP_DropObjects)
-		PublicationDropRelations(pubid, rels, false);
+		PublicationDropTables(pubid, rels, false);
 	else						/* AP_SetObjects */
 	{
 		List	   *oldrelids = GetPublicationRelations(pubid,
-														PUB_OBJTYPE_TABLE,
 														PUBLICATION_PART_ROOT);
 		List	   *delrels = NIL;
 		ListCell   *oldlc;
@@ -1401,18 +1266,18 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
 		}

 		/* And drop them. */
-		PublicationDropRelations(pubid, delrels, true);
+		PublicationDropTables(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);
+		PublicationAddTables(pubid, rels, true, stmt);

-		CloseRelationList(delrels);
+		CloseTableList(delrels);
 	}

-	CloseRelationList(rels);
+	CloseTableList(rels);
 }

 /*
@@ -1422,8 +1287,7 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup,
 */
 static void
 AlterPublicationSchemas(AlterPublicationStmt *stmt,
-						HeapTuple tup, List *schemaidlist,
-						char objectType)
+						HeapTuple tup, List *schemaidlist)
 {
 	Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup);

@@ -1445,20 +1309,20 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt,
 		List	   *rels;
 		List	   *reloids;

-		reloids = GetPublicationRelations(pubform->oid, objectType, PUBLICATION_PART_ROOT);
+		reloids = GetPublicationRelations(pubform->oid, PUBLICATION_PART_ROOT);
 		rels = OpenRelIdList(reloids);

 		CheckObjSchemaNotAlreadyInPublication(rels, schemaidlist,
 											  PUBLICATIONOBJ_TABLES_IN_SCHEMA);

-		CloseRelationList(rels);
-		PublicationAddSchemas(pubform->oid, schemaidlist, objectType, false, stmt);
+		CloseTableList(rels);
+		PublicationAddSchemas(pubform->oid, schemaidlist, false, stmt);
 	}
 	else if (stmt->action == AP_DropObjects)
-		PublicationDropSchemas(pubform->oid, schemaidlist, objectType, false);
+		PublicationDropSchemas(pubform->oid, schemaidlist, false);
 	else						/* AP_SetObjects */
 	{
-		List	   *oldschemaids = GetPublicationSchemas(pubform->oid, objectType);
+		List	   *oldschemaids = GetPublicationSchemas(pubform->oid);
 		List	   *delschemas = NIL;

 		/* Identify which schemas should be dropped */
@@ -1471,13 +1335,13 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt,
 		LockSchemaList(delschemas);

 		/* And drop them */
-		PublicationDropSchemas(pubform->oid, delschemas, objectType, true);
+		PublicationDropSchemas(pubform->oid, delschemas, true);

 		/*
 		 * Don't bother calculating the difference for adding, we'll catch and
 		 * skip existing ones when doing catalog update.
 		 */
-		PublicationAddSchemas(pubform->oid, schemaidlist, objectType, true, stmt);
+		PublicationAddSchemas(pubform->oid, schemaidlist, true, stmt);
 	}
 }

@@ -1487,13 +1351,12 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt,
 */
 static void
 CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup,
-					  List *tables, List *tables_schemaidlist,
-					  List *sequences, List *sequences_schemaidlist)
+					  List *tables, List *schemaidlist)
 {
 	Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup);

 	if ((stmt->action == AP_AddObjects || stmt->action == AP_SetObjects) &&
-		(tables_schemaidlist || sequences_schemaidlist) && !superuser())
+		schemaidlist && !superuser())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be superuser to add or set schemas")));
@@ -1502,24 +1365,13 @@ CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup,
 	 * Check that user is allowed to manipulate the publication tables in
 	 * schema
 	 */
-	if (tables_schemaidlist && pubform->puballtables)
+	if (schemaidlist && pubform->puballtables)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("publication \"%s\" is defined as FOR ALL TABLES",
 						NameStr(pubform->pubname)),
 				 errdetail("Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.")));

-	/*
-	 * Check that user is allowed to manipulate the publication sequences in
-	 * schema
-	 */
-	if (sequences_schemaidlist && pubform->puballsequences)
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("publication \"%s\" is defined as FOR ALL SEQUENCES",
-						NameStr(pubform->pubname)),
-				 errdetail("Sequences from schema cannot be added to, dropped from, or set on FOR ALL SEQUENCES publications.")));
-
 	/* Check that user is allowed to manipulate the publication tables. */
 	if (tables && pubform->puballtables)
 		ereport(ERROR,
@@ -1527,108 +1379,6 @@ CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup,
 				 errmsg("publication \"%s\" is defined as FOR ALL TABLES",
 						NameStr(pubform->pubname)),
 				 errdetail("Tables cannot be added to or dropped from FOR ALL TABLES publications.")));
-
-	/* Check that user is allowed to manipulate the publication sequences. */
-	if (sequences && pubform->puballsequences)
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("publication \"%s\" is defined as FOR ALL SEQUENCES",
-						NameStr(pubform->pubname)),
-				 errdetail("Sequences cannot be added to or dropped from FOR ALL SEQUENCES publications.")));
-}
-
-/*
- * Add or remove sequence to/from publication.
- */
-static void
-AlterPublicationSequences(AlterPublicationStmt *stmt, HeapTuple tup,
-						  List *sequences, List *schemaidlist)
-{
-	List	   *rels = NIL;
-	Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup);
-	Oid			pubid = pubform->oid;
-
-	/*
-	 * It is quite possible that for the SET case user has not specified any
-	 * tables in which case we need to remove all the existing tables.
-	 */
-	if (!sequences && stmt->action != AP_SetObjects)
-		return;
-
-	rels = OpenRelationList(sequences, PUB_OBJTYPE_SEQUENCE);
-
-	if (stmt->action == AP_AddObjects)
-	{
-		List	   *schemas = NIL;
-
-		/*
-		 * Check if the relation is member of the existing schema in the
-		 * publication or member of the schema list specified.
-		 */
-		schemas = list_concat_copy(schemaidlist,
-								   GetPublicationSchemas(pubid,
-														 PUB_OBJTYPE_SEQUENCE));
-		CheckObjSchemaNotAlreadyInPublication(rels, schemas,
-											  PUBLICATIONOBJ_SEQUENCE);
-		PublicationAddRelations(pubid, rels, false, stmt);
-	}
-	else if (stmt->action == AP_DropObjects)
-		PublicationDropRelations(pubid, rels, false);
-	else						/* DEFELEM_SET */
-	{
-		List	   *oldrelids = GetPublicationRelations(pubid,
-														PUB_OBJTYPE_SEQUENCE,
-														PUBLICATION_PART_ROOT);
-		List	   *delrels = NIL;
-		ListCell   *oldlc;
-
-		CheckObjSchemaNotAlreadyInPublication(rels, schemaidlist,
-											  PUBLICATIONOBJ_SEQUENCE);
-
-		/* Calculate which relations to drop. */
-		foreach(oldlc, oldrelids)
-		{
-			Oid			oldrelid = lfirst_oid(oldlc);
-			ListCell   *newlc;
-			PublicationRelInfo *oldrel;
-			bool		found = false;
-
-			foreach(newlc, rels)
-			{
-				PublicationRelInfo *newpubrel;
-
-				newpubrel = (PublicationRelInfo *) lfirst(newlc);
-				if (RelationGetRelid(newpubrel->relation) == oldrelid)
-				{
-					found = true;
-					break;
-				}
-			}
-			/* Not yet in the list, open it and add to the list */
-			if (!found)
-			{
-				oldrel = palloc(sizeof(PublicationRelInfo));
-				oldrel->whereClause = NULL;
-				oldrel->columns = NULL;
-				oldrel->relation = table_open(oldrelid,
-											  ShareUpdateExclusiveLock);
-				delrels = lappend(delrels, oldrel);
-			}
-		}
-
-		/* And drop them. */
-		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);
-
-		CloseRelationList(delrels);
-	}
-
-	CloseRelationList(rels);
 }

 /*
@@ -1666,20 +1416,14 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt)
 		AlterPublicationOptions(pstate, stmt, rel, tup);
 	else
 	{
-		List	   *tables = NIL;
-		List	   *sequences = NIL;
-		List	   *tables_schemaidlist = NIL;
-		List	   *sequences_schemaidlist = NIL;
+		List	   *relations = NIL;
+		List	   *schemaidlist = NIL;
 		Oid			pubid = pubform->oid;

-		ObjectsInPublicationToOids(stmt->pubobjects, pstate,
-								   &tables, &sequences,
-								   &tables_schemaidlist,
-								   &sequences_schemaidlist);
+		ObjectsInPublicationToOids(stmt->pubobjects, pstate, &relations,
+								   &schemaidlist);

-		CheckAlterPublication(stmt, tup,
-							  tables, tables_schemaidlist,
-							  sequences, sequences_schemaidlist);
+		CheckAlterPublication(stmt, tup, relations, schemaidlist);

 		heap_freetuple(tup);

@@ -1707,16 +1451,9 @@ AlterPublication(ParseState *pstate, AlterPublicationStmt *stmt)
 					errmsg("publication \"%s\" does not exist",
 						   stmt->pubname));

-		AlterPublicationTables(stmt, tup, tables, tables_schemaidlist,
+		AlterPublicationTables(stmt, tup, relations, schemaidlist,
 							   pstate->p_sourcetext);
-
-		AlterPublicationSequences(stmt, tup, sequences, sequences_schemaidlist);
-
-		AlterPublicationSchemas(stmt, tup, tables_schemaidlist,
-								PUB_OBJTYPE_TABLE);
-
-		AlterPublicationSchemas(stmt, tup, sequences_schemaidlist,
-								PUB_OBJTYPE_SEQUENCE);
+		AlterPublicationSchemas(stmt, tup, schemaidlist);
 	}

 	/* Cleanup. */
@@ -1784,7 +1521,7 @@ RemovePublicationById(Oid pubid)
 	pubform = (Form_pg_publication) GETSTRUCT(tup);

 	/* Invalidate relcache so that publication info is rebuilt. */
-	if (pubform->puballtables || pubform->puballsequences)
+	if (pubform->puballtables)
 		CacheInvalidateRelcacheAll();

 	CatalogTupleDelete(rel, &tup->t_self);
@@ -1820,7 +1557,6 @@ RemovePublicationSchemaById(Oid psoid)
 	 * partitions.
 	 */
 	schemaRels = GetSchemaPublicationRelations(pubsch->pnnspid,
-											   pubsch->pntype,
 											   PUBLICATION_PART_ALL);
 	InvalidatePublicationRels(schemaRels);

@@ -1863,10 +1599,10 @@ OpenRelIdList(List *relids)
 * add them to a publication.
 */
 static List *
-OpenRelationList(List *rels, char objectType)
+OpenTableList(List *tables)
 {
 	List	   *relids = NIL;
-	List	   *result = NIL;
+	List	   *rels = NIL;
 	ListCell   *lc;
 	List	   *relids_with_rf = NIL;
 	List	   *relids_with_collist = NIL;
@@ -1874,35 +1610,19 @@ OpenRelationList(List *rels, char objectType)
 	/*
 	 * Open, share-lock, and check all the explicitly-specified relations
 	 */
-	foreach(lc, rels)
+	foreach(lc, tables)
 	{
 		PublicationTable *t = lfirst_node(PublicationTable, lc);
 		bool		recurse = t->relation->inh;
 		Relation	rel;
 		Oid			myrelid;
 		PublicationRelInfo *pub_rel;
-		char		myrelkind;

 		/* Allow query cancel in case this takes a long time */
 		CHECK_FOR_INTERRUPTS();

 		rel = table_openrv(t->relation, ShareUpdateExclusiveLock);
 		myrelid = RelationGetRelid(rel);
-		myrelkind = get_rel_relkind(myrelid);
-
-		/*
-		 * Make sure the relkind matches the expected object type. This may
-		 * happen e.g. when adding a sequence using ADD TABLE or a table
-		 * using ADD SEQUENCE).
-		 *
-		 * XXX We let through unsupported object types (views etc.). Those
-		 * will be caught later in check_publication_add_relation.
-		 */
-		if (pub_get_object_type_for_relkind(myrelkind) != PUB_OBJTYPE_UNSUPPORTED &&
-			pub_get_object_type_for_relkind(myrelkind) != objectType)
-			ereport(ERROR,
-					errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					errmsg("object type does not match type expected by command"));

 		/*
 		 * Filter out duplicates if user specifies "foo, foo".
@@ -1935,7 +1655,7 @@ OpenRelationList(List *rels, char objectType)
 		pub_rel->relation = rel;
 		pub_rel->whereClause = t->whereClause;
 		pub_rel->columns = t->columns;
-		result = lappend(result, pub_rel);
+		rels = lappend(rels, pub_rel);
 		relids = lappend_oid(relids, myrelid);

 		if (t->whereClause)
@@ -2004,9 +1724,10 @@ OpenRelationList(List *rels, char objectType)
 				pub_rel->relation = rel;
 				/* child inherits WHERE clause from parent */
 				pub_rel->whereClause = t->whereClause;
+
 				/* child inherits column list from parent */
 				pub_rel->columns = t->columns;
-				result = lappend(result, pub_rel);
+				rels = lappend(rels, pub_rel);
 				relids = lappend_oid(relids, childrelid);

 				if (t->whereClause)
@@ -2021,14 +1742,14 @@ OpenRelationList(List *rels, char objectType)
 	list_free(relids);
 	list_free(relids_with_rf);

-	return result;
+	return rels;
 }

 /*
 * Close all relations in the list.
 */
 static void
-CloseRelationList(List *rels)
+CloseTableList(List *rels)
 {
 	ListCell   *lc;

@@ -2076,12 +1797,12 @@ LockSchemaList(List *schemalist)
 * Add listed tables to the publication.
 */
 static void
-PublicationAddRelations(Oid pubid, List *rels, bool if_not_exists,
+PublicationAddTables(Oid pubid, List *rels, bool if_not_exists,
 					 AlterPublicationStmt *stmt)
 {
 	ListCell   *lc;

-	Assert(!stmt || !stmt->for_all_objects);
+	Assert(!stmt || !stmt->for_all_tables);

 	foreach(lc, rels)
 	{
@@ -2110,7 +1831,7 @@ PublicationAddRelations(Oid pubid, List *rels, bool if_not_exists,
 * Remove listed tables from the publication.
 */
 static void
-PublicationDropRelations(Oid pubid, List *rels, bool missing_ok)
+PublicationDropTables(Oid pubid, List *rels, bool missing_ok)
 {
 	ObjectAddress obj;
 	ListCell   *lc;
@@ -2155,19 +1876,19 @@ PublicationDropRelations(Oid pubid, List *rels, bool missing_ok)
 * Add listed schemas to the publication.
 */
 static void
-PublicationAddSchemas(Oid pubid, List *schemas, char objectType,
-					  bool if_not_exists, AlterPublicationStmt *stmt)
+PublicationAddSchemas(Oid pubid, List *schemas, bool if_not_exists,
+					  AlterPublicationStmt *stmt)
 {
 	ListCell   *lc;

-	Assert(!stmt || !stmt->for_all_objects);
+	Assert(!stmt || !stmt->for_all_tables);

 	foreach(lc, schemas)
 	{
 		Oid			schemaid = lfirst_oid(lc);
 		ObjectAddress obj;

-		obj = publication_add_schema(pubid, schemaid, objectType, if_not_exists);
+		obj = publication_add_schema(pubid, schemaid, if_not_exists);
 		if (stmt)
 		{
 			EventTriggerCollectSimpleCommand(obj, InvalidObjectAddress,
@@ -2183,7 +1904,7 @@ PublicationAddSchemas(Oid pubid, List *schemas, char objectType,
 * Remove listed schemas from the publication.
 */
 static void
-PublicationDropSchemas(Oid pubid, List *schemas, char objectType, bool missing_ok)
+PublicationDropSchemas(Oid pubid, List *schemas, bool missing_ok)
 {
 	ObjectAddress obj;
 	ListCell   *lc;
@@ -2193,11 +1914,10 @@ PublicationDropSchemas(Oid pubid, List *schemas, char objectType, bool missing_o
 	{
 		Oid			schemaid = lfirst_oid(lc);

-		psid = GetSysCacheOid3(PUBLICATIONNAMESPACEMAP,
+		psid = GetSysCacheOid2(PUBLICATIONNAMESPACEMAP,
 							   Anum_pg_publication_namespace_oid,
 							   ObjectIdGetDatum(schemaid),
-							   ObjectIdGetDatum(pubid),
-							   CharGetDatum(objectType));
+							   ObjectIdGetDatum(pubid));
 		if (!OidIsValid(psid))
 		{
 			if (missing_ok)
@@ -2252,13 +1972,6 @@ AlterPublicationOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 							NameStr(form->pubname)),
 					 errhint("The owner of a FOR ALL TABLES publication must be a superuser.")));

-		if (form->puballsequences && !superuser_arg(newOwnerId))
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("permission denied to change owner of publication \"%s\"",
-							NameStr(form->pubname)),
-					 errhint("The owner of a FOR ALL SEQUENCES publication must be a superuser.")));
-
 		if (!superuser_arg(newOwnerId) && is_schema_publication(form->oid))
 			ereport(ERROR,
 					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),