Commitd0460a3

committed

Add missing support for the latest SPI status codes.

SPI_result_code_string() was missing support for SPI_OK_TD_REGISTER,and in v15 and later, it was missing support for SPI_OK_MERGE, as waspltcl_process_SPI_result().The last of those would trigger an error if a MERGE was executed fromPL/Tcl. The others seem fairly innocuous, but worth fixing.Back-patch to all supported branches. Before v15, this is just addingSPI_OK_TD_REGISTER to SPI_result_code_string(), which is unlikely tobe seen by anyone, but seems worth doing for completeness.Reviewed by Tom Lane.Discussion:https://postgr.es/m/CAEZATCUg8V%2BK%2BGcafOPqymxk84Y_prXgfe64PDoopjLFH6Z0Aw%40mail.gmail.com https://postgr.es/m/CAEZATCUMe%2B_KedPMM9AxKqm%3DSZogSxjUcrMe%2BsakusZh3BFcQw%40mail.gmail.com

1 parent0d3b49d commitd0460a3Copy full SHA for d0460a3

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,15 @@ typedef struct SPITupleTable`
`437`	`437`	`</listitem>`
`438`	`438`	`</varlistentry>`
`439`	`439`
	`440`	`+ <varlistentry>`
	`441`	`+ <term><symbol>SPI_OK_MERGE</symbol></term>`
	`442`	`+ <listitem>`
	`443`	`+ <para>`
	`444`	`+ if a <command>MERGE</command> was executed`
	`445`	`+ </para>`
	`446`	`+ </listitem>`
	`447`	`+ </varlistentry>`
	`448`	`+`
`440`	`449`	`<varlistentry>`
`441`	`450`	`<term><symbol>SPI_OK_INSERT_RETURNING</symbol></term>`
`442`	`451`	`<listitem>`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2029,6 +2029,10 @@ SPI_result_code_string(int code)`
`2029`	`2029`	`return"SPI_OK_REL_REGISTER";`
`2030`	`2030`	`caseSPI_OK_REL_UNREGISTER:`
`2031`	`2031`	`return"SPI_OK_REL_UNREGISTER";`
	`2032`	`+caseSPI_OK_TD_REGISTER:`
	`2033`	`+return"SPI_OK_TD_REGISTER";`
	`2034`	`+caseSPI_OK_MERGE:`
	`2035`	`+return"SPI_OK_MERGE";`
`2032`	`2036`	`}`
`2033`	`2037`	`/* Unrecognized code ... return something useful ... */`
`2034`	`2038`	`sprintf(buf,"Unrecognized SPI code %d",code);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2441,6 +2441,7 @@ pltcl_process_SPI_result(Tcl_Interp *interp,`
`2441`	`2441`	`caseSPI_OK_INSERT:`
`2442`	`2442`	`caseSPI_OK_DELETE:`
`2443`	`2443`	`caseSPI_OK_UPDATE:`
	`2444`	`+caseSPI_OK_MERGE:`
`2444`	`2445`	`Tcl_SetObjResult(interp,Tcl_NewWideIntObj(ntuples));`
`2445`	`2446`	`break;`
`2446`	`2447`

Comments

(0)