NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit13797cb

committed

Revert part of the previous patch that avoided using PLy_elog().

That caused the plpython_unicode regression test to fail on SQL_ASCIIencoding, as evidenced by the buildfarm. The reason is that with the patch,you don't get the detail in the error message that you got before. Thatdetail is actually very informative, so rather than just adjust the expectedoutput, let's revert that part of the patch for now to make the buildfarmgreen again, and figure out some other way to avoid the recursion ofPLy_elog() that doesn't lose the detail.

1 parent2956745 commit13797cbCopy full SHA for 13797cb

File tree

1 file changed

-10

lines changed

src/pl/plpython
- plpython.c

1 file changed

-10

lines changed

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

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3745,16 +3745,7 @@ PLyUnicode_Bytes(PyObject *unicode)`
`3745`	`3745`
`3746`	`3746`	`rv=PyUnicode_AsEncodedString(unicode,serverenc,"strict");`
`3747`	`3747`	`if (rv==NULL)`
`3748`		`-{`
`3749`		`-/*`
`3750`		`- * Use a plain ereport instead of PLy_elog to avoid recursion, if`
`3751`		`- * the traceback formatting functions try to do unicode to bytes`
`3752`		`- * conversion again.`
`3753`		`- */`
`3754`		`-ereport(ERROR,`
`3755`		`-(errcode(ERRCODE_INTERNAL_ERROR),`
`3756`		`-errmsg("could not convert Python Unicode object to PostgreSQL server encoding")));`
`3757`		`-}`
	`3748`	`+PLy_elog(ERROR,"could not convert Python Unicode object to PostgreSQL server encoding");`
`3758`	`3749`	`returnrv;`
`3759`	`3750`	`}`
`3760`	`3751`

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!

Commit13797cb

File tree

1 file changed

1 file changed

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

0 commit comments