Commit73d78e1

committed

Throw error for ALTER TABLE RESET of an invalid option

Also adjust pg_upgrade to not use this method for optional TOAST tablecreation.Patch by Fabrízio de Royes Mello

1 parentebe30ad commit73d78e1Copy full SHA for 73d78e1

File tree

+34

-1

lines changed

+34

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ 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`	`+`
`118`	`122`	`ntups=PQntuples(res);`
`119`	`123`	`i_nspname=PQfnumber(res,"nspname");`
`120`	`124`	`i_relname=PQfnumber(res,"relname");`
`@@ -125,13 +129,16 @@ optionally_create_toast_tables(void)`
`125`	`129`	`OPTIONALLY_CREATE_TOAST_OID));`
`126`	`130`
`127`	`131`	`/* dummy command that also triggers check for required TOAST table */`
`128`		`-PQclear(executeQueryOrDie(conn,"ALTER TABLE %s.%sRESET (binary_upgrade_dummy_option);",`
	`132`	`+PQclear(executeQueryOrDie(conn,"ALTER TABLE %s.%sDROP CONSTRAINT IF EXISTS binary_upgrade_dummy_constraint;",`
`129`	`133`	`quote_identifier(PQgetvalue(res,rowno,i_nspname)),`
`130`	`134`	`quote_identifier(PQgetvalue(res,rowno,i_relname))));`
`131`	`135`	`}`
`132`	`136`
`133`	`137`	`PQclear(res);`
`134`	`138`
	`139`	`+PQclear(executeQueryOrDie(conn,"RESET client_min_messages;"));`
	`140`	`+PQclear(executeQueryOrDie(conn,"RESET log_min_messages;"));`
	`141`	`+`
`135`	`142`	`PQfinish(conn);`
`136`	`143`	`}`
`137`	`144`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,8 @@ 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`	`+`
`310`	`312`	`/*`
`311`	`313`	`* initialize_reloptions`
`312`	`314`	`*initialization routine, must be called before parsing`
`@@ -381,6 +383,25 @@ initialize_reloptions(void)`
`381`	`383`	`need_initialization= false;`
`382`	`384`	`}`
`383`	`385`
	`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`	`+`
`384`	`405`	`/*`
`385`	`406`	`* add_reloption_kind`
`386`	`407`	`*Create a new relopt_kind value, to be used in custom reloptions by`
`@@ -672,6 +693,11 @@ transformRelOptions(Datum oldOptions, List defList, char namspace,`
`672`	`693`
`673`	`694`	`if (isReset)`
`674`	`695`	`{`
	`696`	`+if (!is_valid_reloption(def->defname))`
	`697`	`+ereport(ERROR,`
	`698`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`699`	`+errmsg("unrecognized parameter \"%s\"",def->defname)));`
	`700`	`+`
`675`	`701`	`if (def->arg!=NULL)`
`676`	`702`	`ereport(ERROR,`
`677`	`703`	`(errcode(ERRCODE_SYNTAX_ERROR),`

Comments

(0)