database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Ignore publication tables when --no-publications is used

Browse Source 
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.
This commit is contained in:
Michael Paquier 2018-09-25 11:05:13 +09:00
parent a3bb831efe
commit 1f50394119
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -2855,8 +2855,13 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
if (ropt->no_comments && strcmp(te->desc, "COMMENT") == 0) if (ropt->no_comments && strcmp(te->desc, "COMMENT") == 0)
return 0; 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; return 0;
/* If it's a security label, maybe ignore it */ /* If it's a security label, maybe ignore it */

3
src/bin/pg_dump/pg_dump.c
View File

@ -3886,6 +3886,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
PQExpBuffer query; PQExpBuffer query;
PGresult *res; PGresult *res;
PublicationRelInfo *pubrinfo; PublicationRelInfo *pubrinfo;
DumpOptions *dopt = fout->dopt;
int i_tableoid; int i_tableoid;
int i_oid; int i_oid;
int i_pubname; int i_pubname;
@ -3893,7 +3894,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
j, j,
ntups; ntups;
if (fout->remoteVersion < 100000) if (dopt->no_publications || fout->remoteVersion < 100000)
return; return;
query = createPQExpBuffer(); query = createPQExpBuffer();