Commit6cb74a6

committed

revert "Throw error for ALTER TABLE RESET of an invalid option"

Reverts commits73d78e1 andb0488e5. Also reverts pg_upgradechanges.

1 parent2209b39 commit6cb74a6Copy full SHA for 6cb74a6

File tree

-36

lines changed

-36

lines changed

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,6 @@ optionally_create_toast_tables(void)`
`115`	`115`	`"c.relkind IN ('r', 'm') AND "`
`116`	`116`	`"c.reltoastrelid = 0");`
`117`	`117`
`118`		`-/* Suppress NOTICE output from non-existant constraints */`
`119`		`-PQclear(executeQueryOrDie(conn,"SET client_min_messages = warning;"));`
`120`		`-PQclear(executeQueryOrDie(conn,"SET log_min_messages = warning;"));`
`121`		`-PQclear(executeQueryOrDie(conn,"SET log_min_error_statement = warning;"));`
`122`		`-`
`123`	`118`	`ntups=PQntuples(res);`
`124`	`119`	`i_nspname=PQfnumber(res,"nspname");`
`125`	`120`	`i_relname=PQfnumber(res,"relname");`
`@@ -130,17 +125,13 @@ optionally_create_toast_tables(void)`
`130`	`125`	`OPTIONALLY_CREATE_TOAST_OID));`
`131`	`126`
`132`	`127`	`/* dummy command that also triggers check for required TOAST table */`
`133`		`-PQclear(executeQueryOrDie(conn,"ALTER TABLE %s.%sDROP CONSTRAINT IF EXISTS binary_upgrade_dummy_constraint;",`
	`128`	`+PQclear(executeQueryOrDie(conn,"ALTER TABLE %s.%sRESET (binary_upgrade_dummy_option);",`
`134`	`129`	`quote_identifier(PQgetvalue(res,rowno,i_nspname)),`
`135`	`130`	`quote_identifier(PQgetvalue(res,rowno,i_relname))));`
`136`	`131`	`}`
`137`	`132`
`138`	`133`	`PQclear(res);`
`139`	`134`
`140`		`-PQclear(executeQueryOrDie(conn,"RESET client_min_messages;"));`
`141`		`-PQclear(executeQueryOrDie(conn,"RESET log_min_messages;"));`
`142`		`-PQclear(executeQueryOrDie(conn,"RESET log_min_error_statement;"));`
`143`		`-`
`144`	`135`	`PQfinish(conn);`
`145`	`136`	`}`
`146`	`137`

Lines changed: 0 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,8 +307,6 @@ static void initialize_reloptions(void);`
`307`	`307`	`staticvoidparse_one_reloption(relopt_valueoption,chartext_str,`
`308`	`308`	`inttext_len,boolvalidate);`
`309`	`309`
`310`		`-staticboolis_valid_reloption(char*name);`
`311`		`-`
`312`	`310`	`/*`
`313`	`311`	`* initialize_reloptions`
`314`	`312`	`*initialization routine, must be called before parsing`
`@@ -383,25 +381,6 @@ initialize_reloptions(void)`
`383`	`381`	`need_initialization= false;`
`384`	`382`	`}`
`385`	`383`
`386`		`-/*`
`387`		`- * is_valid_reloption`
`388`		`- *check if a reloption exists`
`389`		`- *`
`390`		`- */`
`391`		`-staticbool`
`392`		`-is_valid_reloption(char*name)`
`393`		`-{`
`394`		`-inti;`
`395`		`-`
`396`		`-for (i=0;relOpts[i];i++)`
`397`		`-{`
`398`		`-if (pg_strcasecmp(relOpts[i]->name,name)==0)`
`399`		`-return true;`
`400`		`-}`
`401`		`-`
`402`		`-return false;`
`403`		`-}`
`404`		`-`
`405`	`384`	`/*`
`406`	`385`	`* add_reloption_kind`
`407`	`386`	`*Create a new relopt_kind value, to be used in custom reloptions by`
`@@ -693,11 +672,6 @@ transformRelOptions(Datum oldOptions, List defList, char namspace,`
`693`	`672`
`694`	`673`	`if (isReset)`
`695`	`674`	`{`
`696`		`-if (!is_valid_reloption(def->defname))`
`697`		`-ereport(ERROR,`
`698`		`-(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`699`		`-errmsg("unrecognized parameter \"%s\"",def->defname)));`
`700`		`-`
`701`	`675`	`if (def->arg!=NULL)`
`702`	`676`	`ereport(ERROR,`
`703`	`677`	`(errcode(ERRCODE_SYNTAX_ERROR),`

Comments

(0)