From 73d78e11a0f7183c80b93eefbbb6026fe9664015 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Mon, 25 Aug 2014 17:06:40 -0400
Subject: Throw error for ALTER TABLE RESET of an invalid option

Also adjust pg_upgrade to not use this method for optional TOAST table
creation.

Patch by Fabrízio de Royes Mello
---
 contrib/pg_upgrade/dump.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'contrib')

diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
index e623a226327..29a68c07a2d 100644
--- a/contrib/pg_upgrade/dump.c
+++ b/contrib/pg_upgrade/dump.c
@@ -115,6 +115,10 @@ optionally_create_toast_tables(void)
 								"c.relkind IN ('r', 'm') AND "
 								"c.reltoastrelid = 0");
 
+		/* Suppress NOTICE output from non-existant constraints */
+		PQclear(executeQueryOrDie(conn, "SET client_min_messages = warning;"));
+		PQclear(executeQueryOrDie(conn, "SET log_min_messages = warning;"));
+
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
 		i_relname = PQfnumber(res, "relname");
@@ -125,13 +129,16 @@ optionally_create_toast_tables(void)
 					OPTIONALLY_CREATE_TOAST_OID));
 
 			/* dummy command that also triggers check for required TOAST table */
-			PQclear(executeQueryOrDie(conn, "ALTER TABLE %s.%s RESET (binary_upgrade_dummy_option);",
+			PQclear(executeQueryOrDie(conn, "ALTER TABLE %s.%s DROP CONSTRAINT IF EXISTS binary_upgrade_dummy_constraint;",
 					quote_identifier(PQgetvalue(res, rowno, i_nspname)),
 					quote_identifier(PQgetvalue(res, rowno, i_relname))));
 		}
 
 		PQclear(res);
 
+		PQclear(executeQueryOrDie(conn, "RESET client_min_messages;"));
+		PQclear(executeQueryOrDie(conn, "RESET log_min_messages;"));
+
 		PQfinish(conn);
 	}
 
-- 
cgit v1.2.3