Ensure schema qualification in pg_restore DISABLE/ENABLE TRIGGER commands.

Previously, this code blindly followed the common coding pattern of
passing PQserverVersion(AH->connection) as the server-version parameter
of fmtQualifiedId.  That works as long as we have a connection; but in
pg_restore with text output, we don't.  Instead we got a zero from
PQserverVersion, which fmtQualifiedId interpreted as "server is too old to
have schemas", and so the name went unqualified.  That still accidentally
managed to work in many cases, which is probably why this ancient bug went
undetected for so long.  It only became obvious in the wake of the changes
to force dump/restore to execute with restricted search_path.

In HEAD/v11, let's deal with this by ripping out fmtQualifiedId's server-
version behavioral dependency, and just making it schema-qualify all the
time.  We no longer support pg_dump from servers old enough to need the
ability to omit schema name, let alone restoring to them.  (Also, the few
callers outside pg_dump already didn't work with pre-schema servers.)

In older branches, that's not an acceptable solution, so instead just
tweak the DISABLE/ENABLE TRIGGER logic to ensure it will schema-qualify
its output regardless of server version.

Per bug #15338 from Oleg somebody.  Back-patch to all supported branches.

Discussion: https://postgr.es/m/153452458706.1316.5328079417086507743@wrigleys.postgresql.org

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 8892b177905ea81b58ddbc728fd46d47e2d017c6..651d2a4b8e1ed011f76b7feb8593fcf5297c22dc 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -992,10 +992,12 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te)
    _becomeUser(AH, ropt->superuser);
 
    /*
-    * Disable them.
+    * Disable them.  Assume that the table name should be schema-qualified
+    * (we can't look at PQserverVersion, since we might not have any
+    * connection; and anyway we don't promise our output will load pre-7.3).
     */
    ahprintf(AH, "ALTER TABLE %s DISABLE TRIGGER ALL;\n\n",
-            fmtQualifiedId(PQserverVersion(AH->connection),
+            fmtQualifiedId(70300,
                            te->namespace,
                            te->tag));
 }
@@ -1020,10 +1022,10 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te)
    _becomeUser(AH, ropt->superuser);
 
    /*
-    * Enable them.
+    * Enable them.  As above, force schema qualification.
     */
    ahprintf(AH, "ALTER TABLE %s ENABLE TRIGGER ALL;\n\n",
-            fmtQualifiedId(PQserverVersion(AH->connection),
+            fmtQualifiedId(70300,
                            te->namespace,
                            te->tag));
 }