postgres.git / summary / log / commit / refs

commit    0870397ccfbdcf830e5fd75608415f7b5c3bc2e7
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu Sep 18 02:09:15 2025 +0000
First released in: 13.23, 14.20, 15.15, 16.11, 17.7, 18.0

    pg_restore: Fix security label handling with --no-publications/subscriptions.
    
    Previously, pg_restore did not skip security labels on publications or
    subscriptions even when --no-publications or --no-subscriptions was specified.
    As a result, it could issue SECURITY LABEL commands for objects that were
    never created, causing those commands to fail.
    
    This commit fixes the issue by ensuring that security labels on publications
    and subscriptions are also skipped when the corresponding options are used.
    
    Backpatch to all supported versions.
    
    Author: Jian He <jian.universality@gmail.com>
    Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
    Discussion: https://postgr.es/m/CACJufxHCt00pR9h51AVu6+yPD5J7JQn=7dQXxqacj0XyDhc-fA@mail.gmail.com
    Backpatch-through: 13


 src/bin/pg_dump/pg_backup_archiver.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 90f08e997d8..74e3c564972 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2883,6 +2883,21 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 	if (ropt->no_security_labels && strcmp(te->desc, "SECURITY LABEL") == 0)
 		return 0;
 
+	/*
+	 * If it's a security label on a publication or a subscription, maybe
+	 * ignore it.
+	 */
+	if (strcmp(te->desc, "SECURITY LABEL") == 0)
+	{
+		if (ropt->no_publications &&
+			strncmp(te->tag, "PUBLICATION", strlen("PUBLICATION")) == 0)
+			return 0;
+
+		if (ropt->no_subscriptions &&
+			strncmp(te->tag, "SUBSCRIPTION", strlen("SUBSCRIPTION")) == 0)
+			return 0;
+	}
+
 	/* If it's a subscription, maybe ignore it */
 	if (ropt->no_subscriptions && strcmp(te->desc, "SUBSCRIPTION") == 0)
 		return 0;


[parent: 7df74e635e65]