postgres.git / summary / log / commit / refs

commit    55a586ba9715b044d7b23a2f60dc003ddcf9239a
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Tue Sep 25 02:05:29 2018 +0000
First released in: 12.0, 10.6, 11.0

    Ignore publication tables when --no-publications is used
    
    96e1cb4 has added support for --no-publications in pg_dump, pg_dumpall
    and pg_restore, but forgot the fact that publication tables also need to
    be ignored when this option is used.
    
    Author: Gilles Darold
    Reviewed-by: Michael Paquier
    Discussion: https://postgr.es/m/3f48e812-b0fa-388e-2043-9a176bdee27e@dalibo.com
    Backpatch-through: 10, where publications have been added.


 src/bin/pg_dump/pg_backup_archiver.c | 9 +++++++--
 src/bin/pg_dump/pg_dump.c            | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 5cbe6658dbe..a2e2f96986a 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2837,8 +2837,13 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 	if (ropt->aclsSkip && _tocEntryIsACL(te))
 		return 0;
 
-	/* If it's a publication, maybe ignore it */
-	if (ropt->no_publications && strcmp(te->desc, "PUBLICATION") == 0)
+	/*
+	 * If it's a publication or a table part of a publication, maybe ignore
+	 * it.
+	 */
+	if (ropt->no_publications &&
+		(strcmp(te->desc, "PUBLICATION") == 0 ||
+		 strcmp(te->desc, "PUBLICATION TABLE") == 0))
 		return 0;
 
 	/* If it's security labels, maybe ignore it */
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index db19f924d80..376b8c7db78 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -3601,6 +3601,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
 	PQExpBuffer query;
 	PGresult   *res;
 	PublicationRelInfo *pubrinfo;
+	DumpOptions *dopt = fout->dopt;
 	int			i_tableoid;
 	int			i_oid;
 	int			i_pubname;
@@ -3608,7 +3609,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
 				j,
 				ntups;
 
-	if (fout->remoteVersion < 100000)
+	if (dopt->no_publications || fout->remoteVersion < 100000)
 		return;
 
 	query = createPQExpBuffer();


[parent: 90a1f97867fe]