Commit804d13a

committed

Fix behavior when raising plpy.Fatal()

It should cause a elog(FATAL) error, and it fact it was simply causinga elog(ERROR).Jan Urbański

1 parent8f76324 commit804d13aCopy full SHA for 804d13a

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4381,8 +4381,13 @@ PLy_elog(int elevel, const char *fmt,...)`
`4381`	`4381`	`intposition=0;`
`4382`	`4382`
`4383`	`4383`	`PyErr_Fetch(&exc,&val,&tb);`
`4384`		`-if (exc!=NULL&&PyErr_GivenExceptionMatches(val,PLy_exc_spi_error))`
`4385`		`-PLy_get_spi_error_data(val,&detail,&hint,&query,&position);`
	`4384`	`+if (exc!=NULL)`
	`4385`	`+{`
	`4386`	`+if (PyErr_GivenExceptionMatches(val,PLy_exc_spi_error))`
	`4387`	`+PLy_get_spi_error_data(val,&detail,&hint,&query,&position);`
	`4388`	`+elseif (PyErr_GivenExceptionMatches(val,PLy_exc_fatal))`
	`4389`	`+elevel=FATAL;`
	`4390`	`+}`
`4386`	`4391`	`PyErr_Restore(exc,val,tb);`
`4387`	`4392`
`4388`	`4393`	`xmsg=PLy_traceback(&xlevel);`

Comments

(0)