diff options
| author | Bruce Momjian | 2014-08-26 00:07:37 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2014-08-26 00:07:37 +0000 |
| commit | 6cb74a67e26523eb2408f441bfc589c80f76c465 (patch) | |
| tree | b078a6bf5b7ff204c0bec715112b89239a232776 /contrib | |
| parent | 2209b3923a7afe0b6033ecfea972219df252ca8e (diff) | |
revert "Throw error for ALTER TABLE RESET of an invalid option"
Reverts commits 73d78e11a0f7183c80b93eefbbb6026fe9664015 and
b0488e5c4fbfdce8acc989bdc17d9f0ec09ac281. Also reverts pg_upgrade
changes.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_upgrade/dump.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c index 1ce2f37a86f..e623a226327 100644 --- a/contrib/pg_upgrade/dump.c +++ b/contrib/pg_upgrade/dump.c @@ -115,11 +115,6 @@ 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;")); - PQclear(executeQueryOrDie(conn, "SET log_min_error_statement = warning;")); - ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); i_relname = PQfnumber(res, "relname"); @@ -130,17 +125,13 @@ 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 DROP CONSTRAINT IF EXISTS binary_upgrade_dummy_constraint;", + PQclear(executeQueryOrDie(conn, "ALTER TABLE %s.%s RESET (binary_upgrade_dummy_option);", 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;")); - PQclear(executeQueryOrDie(conn, "RESET log_min_error_statement;")); - PQfinish(conn); } |