postgres
diff --git a/‎src/backend/replication/logical/relation.c
Copy file name to clipboardExpand all lines: src/backend/replication/logical/relation.c
+34Lines changed: 34 additions & 0 deletions b/‎src/backend/replication/logical/relation.c
Copy file name to clipboardExpand all lines: src/backend/replication/logical/relation.c
+34Lines changed: 34 additions & 0 deletions
diff --git a/‎src/backend/replication/logical/worker.c
Copy file name to clipboardExpand all lines: src/backend/replication/logical/worker.c
+3Lines changed: 3 additions & 0 deletions b/‎src/backend/replication/logical/worker.c
Copy file name to clipboardExpand all lines: src/backend/replication/logical/worker.c
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/include/replication/logicalrelation.h
Copy file name to clipboardExpand all lines: src/include/replication/logicalrelation.h
+1Lines changed: 1 addition & 0 deletions b/‎src/include/replication/logicalrelation.h
Copy file name to clipboardExpand all lines: src/include/replication/logicalrelation.h
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/test/subscription/t/013_partition.pl
Copy file name to clipboardExpand all lines: src/test/subscription/t/013_partition.pl
+15Lines changed: 15 additions & 0 deletions b/‎src/test/subscription/t/013_partition.pl
Copy file name to clipboardExpand all lines: src/test/subscription/t/013_partition.pl
+15Lines changed: 15 additions & 0 deletions
@@ -486,6 +486,40 @@ logicalrep_partmap_invalidate_cb(Datum arg, Oid reloid)
 	}
 }
 
+/*
+ * Reset the entries in the partition map that refer to remoterel.
+ *
+ * Called when new relation mapping is sent by the publisher to update our
+ * expected view of incoming data from said publisher.
+ *
+ * Note that we don't update the remoterel information in the entry here,
+ * we will update the information in logicalrep_partition_open to avoid
+ * unnecessary work.
+ */
+void
+logicalrep_partmap_reset_relmap(LogicalRepRelation *remoterel)
+{
+	HASH_SEQ_STATUS status;
+	LogicalRepPartMapEntry *part_entry;
+	LogicalRepRelMapEntry *entry;
+
+	if (LogicalRepPartMap == NULL)
+		return;
+
+	hash_seq_init(&status, LogicalRepPartMap);
+	while ((part_entry = (LogicalRepPartMapEntry *) hash_seq_search(&status)) != NULL)
+	{
+		entry = &part_entry->relmapentry;
+
+		if (entry->remoterel.remoteid != remoterel->remoteid)
+			continue;
+
+		logicalrep_relmap_free_entry(entry);
+
+		memset(entry, 0, sizeof(LogicalRepRelMapEntry));
+	}
+}
+
 /*
  * Initialize the partition map cache.
  */
 
@@ -1562,6 +1562,9 @@ apply_handle_relation(StringInfo s)
 
 	rel = logicalrep_read_rel(s);
 	logicalrep_relmap_update(rel);
+
+	/* Also reset all entries in the partition map that refer to remoterel. */
+	logicalrep_partmap_reset_relmap(rel);
 }
 
 /*
 
@@ -38,6 +38,7 @@ typedef struct LogicalRepRelMapEntry
 } LogicalRepRelMapEntry;
 
 extern void logicalrep_relmap_update(LogicalRepRelation *remoterel);
+extern void logicalrep_partmap_reset_relmap(LogicalRepRelation *remoterel);
 
 extern LogicalRepRelMapEntry *logicalrep_rel_open(LogicalRepRelId remoteid,
 												  LOCKMODE lockmode);
 
@@ -853,4 +853,19 @@ BEGIN
 	"SELECT a, b, c FROM tab5 ORDER BY 1");
 is($result, qq(3|1|), 'updates of tab5 replicated correctly after altering table on subscriber');
 
+# Test that replication into the partitioned target table continues to
+# work correctly when the published table is altered.
+$node_publisher->safe_psql(
+	'postgres', q{
+	ALTER TABLE tab5 DROP COLUMN b, ADD COLUMN c INT;
+	ALTER TABLE tab5 ADD COLUMN b INT;});
+
+$node_publisher->safe_psql('postgres', "UPDATE tab5 SET c = 1 WHERE a = 3");
+
+$node_publisher->wait_for_catchup('sub2');
+
+$result = $node_subscriber2->safe_psql('postgres',
+	"SELECT a, b, c FROM tab5 ORDER BY 1");
+is($result, qq(3||1), 'updates of tab5 replicated correctly after altering table on publisher');
+
 done_testing();
Original file line number	Diff line number	Diff line change
`@@ -1562,6 +1562,9 @@ apply_handle_relation(StringInfo s)`
`1562`	`1562`
`1563`	`1563`	`rel = logicalrep_read_rel(s);`
`1564`	`1564`	`logicalrep_relmap_update(rel);`
	`1565`	`+`
	`1566`	`+ /* Also reset all entries in the partition map that refer to remoterel. */`
	`1567`	`+ logicalrep_partmap_reset_relmap(rel);`
`1565`	`1568`	`}`
`1566`	`1569`
`1567`	`1570`	`/*`