NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit418df3a

committed

Also save the error detail in SPIError

The temporarily broken plpython_unicode test shows a case where thisis used.Do remaining fix-ups on the expected files at the same time.

1 parentddf8c16 commit418df3aCopy full SHA for 418df3a

File tree

3 files changed

-6

lines changed

src/pl/plpython
- expected
  - plpython_unicode_2.out
  - plpython_unicode_3.out
- plpython.c

3 files changed

-6

lines changed

`‎src/pl/plpython/expected/plpython_unicode_2.out‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ SELECT * FROM unicode_test;`
`41`	`41`	`SELECT unicode_plan1();`
`42`	`42`	`WARNING: PL/Python: plpy.Error: unrecognized error in PLy_spi_execute_plan`
`43`	`43`	`CONTEXT: PL/Python function "unicode_plan1"`
`44`		`-ERROR: PL/Python: could not convert Python Unicode object to PostgreSQL server encoding`
	`44`	`+ERROR: PL/Python:plpy.SPIError: PL/Python:could not convert Python Unicode object to PostgreSQL server encoding`
`45`	`45`	`DETAIL: UnicodeError: ASCII encoding error: ordinal not in range(128)`
`46`	`46`	`CONTEXT: PL/Python function "unicode_plan1"`
`47`	`47`	`SELECT unicode_plan2();`

`‎src/pl/plpython/expected/plpython_unicode_3.out‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ SELECT unicode_plan1();`
`42`	`42`	`WARNING: PL/Python: plpy.Error: unrecognized error in PLy_spi_execute_plan`
`43`	`43`	`CONTEXT: PL/Python function "unicode_plan1"`
`44`	`44`	`ERROR: PL/Python: plpy.SPIError: PL/Python: could not convert Python Unicode object to PostgreSQL server encoding`
	`45`	`+DETAIL: UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)`
`45`	`46`	`CONTEXT: PL/Python function "unicode_plan1"`
`46`	`47`	`SELECT unicode_plan2();`
`47`	`48`	`unicode_plan2`

`‎src/pl/plpython/plpython.c‎`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ static char PLy_procedure_name(PLyProcedure );`
`294`	`294`	`staticvoid`
`295`	`295`	`PLy_elog(int,constchar*,...)`
`296`	`296`	`__attribute__((format(printf,2,3)));`
`297`		`-staticvoidPLy_get_spi_error_data(PyObjectexc,charhint,charquery,intposition);`
	`297`	`+staticvoidPLy_get_spi_error_data(PyObjectexc,chardetail,charhint,charquery,intposition);`
`298`	`298`	`staticcharPLy_traceback(int);`
`299`	`299`
`300`	`300`	`staticvoid*PLy_malloc(size_t);`
`@@ -3551,7 +3551,7 @@ PLy_spi_exception_set(ErrorData *edata)`
`3551`	`3551`	`if (!spierror)`
`3552`	`3552`	`gotofailure;`
`3553`	`3553`
`3554`		`-spidata=Py_BuildValue("(zzi)",edata->hint,`
	`3554`	`+spidata=Py_BuildValue("(zzzi)",edata->detail,edata->hint,`
`3555`	`3555`	`edata->internalquery,edata->internalpos);`
`3556`	`3556`	`if (!spidata)`
`3557`	`3557`	`gotofailure;`
`@@ -3586,13 +3586,14 @@ PLy_elog(int elevel, const char *fmt,...)`
`3586`	`3586`	`intxlevel;`
`3587`	`3587`	`StringInfoDataemsg;`
`3588`	`3588`	`PyObjectexc,val,*tb;`
	`3589`	`+char*detail=NULL;`
`3589`	`3590`	`char*hint=NULL;`
`3590`	`3591`	`char*query=NULL;`
`3591`	`3592`	`intposition=0;`
`3592`	`3593`
`3593`	`3594`	`PyErr_Fetch(&exc,&val,&tb);`
`3594`	`3595`	`if (exc!=NULL&&PyErr_GivenExceptionMatches(val,PLy_exc_spi_error))`
`3595`		`-PLy_get_spi_error_data(val,&hint,&query,&position);`
	`3596`	`+PLy_get_spi_error_data(val,&detail,&hint,&query,&position);`
`3596`	`3597`	`PyErr_Restore(exc,val,tb);`
`3597`	`3598`
`3598`	`3599`	`xmsg=PLy_traceback(&xlevel);`
`@@ -3626,6 +3627,7 @@ PLy_elog(int elevel, const char *fmt,...)`
`3626`	`3627`	`else`
`3627`	`3628`	`ereport(elevel,`
`3628`	`3629`	`(errmsg("PL/Python: %s",xmsg),`
	`3630`	`+ (detail) ?errdetail("%s",detail) :0,`
`3629`	`3631`	`(hint) ?errhint("%s",hint) :0,`
`3630`	`3632`	`(query) ?internalerrquery(query) :0,`
`3631`	`3633`	`(position) ?internalerrposition(position) :0));`
`@@ -3650,15 +3652,15 @@ PLy_elog(int elevel, const char *fmt,...)`
`3650`	`3652`	`* Extract the error data from a SPIError`
`3651`	`3653`	`*/`
`3652`	`3654`	`staticvoid`
`3653`		`-PLy_get_spi_error_data(PyObjectexc,charhint,charquery,intposition)`
	`3655`	`+PLy_get_spi_error_data(PyObjectexc,chardetail,charhint,charquery,intposition)`
`3654`	`3656`	`{`
`3655`	`3657`	`PyObject*spidata=NULL;`
`3656`	`3658`
`3657`	`3659`	`spidata=PyObject_GetAttrString(exc,"spidata");`
`3658`	`3660`	`if (!spidata)`
`3659`	`3661`	`gotocleanup;`
`3660`	`3662`
`3661`		`-if (!PyArg_ParseTuple(spidata,"zzi",hint,query,position))`
	`3663`	`+if (!PyArg_ParseTuple(spidata,"zzzi",detail,hint,query,position))`
`3662`	`3664`	`gotocleanup;`
`3663`	`3665`
`3664`	`3666`	`cleanup:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit418df3a

File tree

3 files changed

3 files changed

`‎src/pl/plpython/expected/plpython_unicode_2.out‎`

`‎src/pl/plpython/expected/plpython_unicode_3.out‎`

`‎src/pl/plpython/plpython.c‎`

0 commit comments