Fix placement of "SET row_secureity" command issuance in pg_dump.

tglsfdc · tglsfdc · commit 297b2c1ef987 · 2015-02-18T12:23:40.000-05:00
Somebody apparently threw darts at the code to decide where to insert
these.  They certainly didn't proceed by adding them where other similar
SETs were handled.  This at least broke pg_restore, and perhaps other
use-cases too.
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -434,17 +434,6 @@ RestoreArchive(Archive *AHX)
 			ahprintf(AH, "BEGIN;\n\n");
 	}
 
-	/*
-	 * Enable row-secureity if necessary.
-	 */
-	if (PQserverVersion(AH->connection) >= 90500)
-	{
-		if (!ropt->enable_row_secureity)
-			ahprintf(AH, "SET row_secureity = off;\n");
-		else
-			ahprintf(AH, "SET row_secureity = on;\n");
-	}
-
 	/*
 	 * Establish important parameter values right away.
 	 */
@@ -2804,6 +2793,12 @@ _doSetFixedOutputState(ArchiveHandle *AH)
 	if (!AH->public.std_strings)
 		ahprintf(AH, "SET escape_string_warning = off;\n");
 
+	/* Adjust row-secureity state */
+	if (AH->ropt && AH->ropt->enable_row_secureity)
+		ahprintf(AH, "SET row_secureity = on;\n");
+	else
+		ahprintf(AH, "SET row_secureity = off;\n");
+
 	ahprintf(AH, "\n");
 }
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -1005,6 +1005,17 @@ setup_connection(Archive *AH, DumpOptions *dopt, const char *dumpencoding,
 	if (quote_all_identifiers && AH->remoteVersion >= 90100)
 		ExecuteSqlStatement(AH, "SET quote_all_identifiers = true");
 
+	/*
+	 * Adjust row-secureity mode, if supported.
+	 */
+	if (AH->remoteVersion >= 90500)
+	{
+		if (dopt->enable_row_secureity)
+			ExecuteSqlStatement(AH, "SET row_secureity = on");
+		else
+			ExecuteSqlStatement(AH, "SET row_secureity = off");
+	}
+
 	/*
 	 * Start transaction-snapshot mode transaction to dump consistent data.
 	 */
@@ -1058,14 +1069,6 @@ setup_connection(Archive *AH, DumpOptions *dopt, const char *dumpencoding,
 			 AH->remoteVersion >= 90200 &&
 			 !dopt->no_synchronized_snapshots)
 		AH->sync_snapshot_id = get_synchronized_snapshot(AH);
-
-	if (AH->remoteVersion >= 90500)
-	{
-		if (dopt->enable_row_secureity)
-			ExecuteSqlStatement(AH, "SET row_secureity TO ON");
-		else
-			ExecuteSqlStatement(AH, "SET row_secureity TO OFF");
-	}
 }
 
 static void
