NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit50d89d4

committed

Force strings passed to and from plperl to be in UTF8 encoding.

String are converted to UTF8 on the way into perl and to thedatabase encoding on the way back. This avoids a number ofobserved anomalies, and ensures Perl a consistent view of theworld.Some minor code cleanups are also accomplished.Alex Hunsaker, reviewed by Andy Colson.

1 parent5ed45ac commit50d89d4Copy full SHA for 50d89d4

File tree

5 files changed

+295

-160

lines changed

doc/src/sgml
- plperl.sgml
src/pl/plperl

5 files changed

+295

-160

lines changed

`‎doc/src/sgml/plperl.sgml`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,14 @@ $$ LANGUAGE plperl;`
`125`	`125`	`</programlisting>`
`126`	`126`	`</para>`
`127`	`127`
	`128`	`+ <note>`
	`129`	`+ <para>`
	`130`	`+ Arguments will be converted from the database's encoding to UTF-8`
	`131`	`+ for use inside plperl, and then converted from UTF-8 back to the`
	`132`	`+ database encoding upon return.`
	`133`	`+ </para>`
	`134`	`+ </note>`
	`135`	`+`
`128`	`136`	`<para>`
`129`	`137`	`If an SQL null value<indexterm><primary>null value</><secondary`
`130`	`138`	`sortas="PL/Perl">in PL/Perl</></indexterm> is passed to a function,`

`‎src/pl/plperl/SPI.xs`

Lines changed: 36 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,14 @@`
`9`	`9`
`10`	`10`	`/* this must be first: */`
`11`	`11`	`#include"postgres.h"`
	`12`	`+#include"mb/pg_wchar.h"/* for GetDatabaseEncoding */`
	`13`	`+`
`12`	`14`	`/* Defined by Perl */`
`13`	`15`	`#undef _`
`14`	`16`
`15`	`17`	`/* perl stuff */`
`16`	`18`	`#include"plperl.h"`
	`19`	`+#include"plperl_helpers.h"`
`17`	`20`
`18`	`21`
`19`	`22`	`/*`
`@@ -50,18 +53,21 @@ PROTOTYPES: ENABLE`
`50`	`53`	`VERSIONCHECK:DISABLE`
`51`	`54`
`52`	`55`	`SV*`
`53`		`-spi_spi_exec_query(query, ...)`
`54`		`-char*query;`
	`56`	`+spi_spi_exec_query(sv, ...)`
	`57`	`+SV*sv;`
`55`	`58`	`PREINIT:`
`56`	`59`	`HV*ret_hash;`
`57`	`60`	`intlimit=0;`
	`61`	`+char*query;`
`58`	`62`	`CODE:`
`59`	`63`	`if (items>2)`
`60`	`64`	`croak("Usage: spi_exec_query(query, limit) "`
`61`	`65`	`"or spi_exec_query(query)");`
`62`	`66`	`if (items==2)`
`63`	`67`	`limit=SvIV(ST(1));`
	`68`	`+query=sv2cstr(sv);`
`64`	`69`	`ret_hash=plperl_spi_exec(query,limit);`
	`70`	`+pfree(query);`
`65`	`71`	`RETVAL=newRV_noinc((SV*)ret_hash);`
`66`	`72`	`OUTPUT:`
`67`	`73`	`RETVAL`
`@@ -73,46 +79,53 @@ spi_return_next(rv)`
`73`	`79`	`do_plperl_return_next(rv);`
`74`	`80`
`75`	`81`	`SV*`
`76`		`-spi_spi_query(query)`
`77`		`-char*query;`
	`82`	`+spi_spi_query(sv)`
	`83`	`+SV*sv;`
`78`	`84`	`CODE:`
	`85`	`+char*query=sv2cstr(sv);`
`79`	`86`	`RETVAL=plperl_spi_query(query);`
	`87`	`+pfree(query);`
`80`	`88`	`OUTPUT:`
`81`	`89`	`RETVAL`
`82`	`90`
`83`	`91`	`SV*`
`84`		`-spi_spi_fetchrow(cursor)`
`85`		`-char*cursor;`
	`92`	`+spi_spi_fetchrow(sv)`
	`93`	`+SV*sv;`
`86`	`94`	`CODE:`
	`95`	`+char*cursor=sv2cstr(sv);`
`87`	`96`	`RETVAL=plperl_spi_fetchrow(cursor);`
	`97`	`+pfree(cursor);`
`88`	`98`	`OUTPUT:`
`89`	`99`	`RETVAL`
`90`	`100`
`91`	`101`	`SV*`
`92`		`-spi_spi_prepare(query, ...)`
`93`		`-char*query;`
	`102`	`+spi_spi_prepare(sv, ...)`
	`103`	`+SV*sv;`
`94`	`104`	`CODE:`
`95`	`105`	`inti;`
`96`	`106`	`SV**argv;`
	`107`	`+char*query=sv2cstr(sv);`
`97`	`108`	`if (items<1)`
`98`	`109`	`Perl_croak(aTHX_"Usage: spi_prepare(query, ...)");`
`99`	`110`	`argv= (SV*)palloc((items-1)sizeof(SV*));`
`100`	`111`	`for (i=1;i<items;i++)`
`101`	`112`	`argv[i-1]=ST(i);`
`102`	`113`	`RETVAL=plperl_spi_prepare(query,items-1,argv);`
`103`	`114`	`pfree(argv);`
	`115`	`+pfree(query);`
`104`	`116`	`OUTPUT:`
`105`	`117`	`RETVAL`
`106`	`118`
`107`	`119`	`SV*`
`108`		`-spi_spi_exec_prepared(query, ...)`
`109`		`-char*query;`
	`120`	`+spi_spi_exec_prepared(sv, ...)`
	`121`	`+SV*sv;`
`110`	`122`	`PREINIT:`
`111`	`123`	`HV*ret_hash;`
`112`	`124`	`CODE:`
`113`	`125`	`HV*attr=NULL;`
`114`	`126`	`inti,offset=1,argc;`
`115`	`127`	`SV**argv;`
	`128`	`+char*query=sv2cstr(sv);`
`116`	`129`	`if (items<1)`
`117`	`130`	`Perl_croak(aTHX_"Usage: spi_exec_prepared(query, [\\%%attr,] "`
`118`	`131`	`"[\\@bind_values])");`
`@@ -128,15 +141,17 @@ spi_spi_exec_prepared(query, ...)`
`128`	`141`	`ret_hash=plperl_spi_exec_prepared(query,attr,argc,argv);`
`129`	`142`	`RETVAL=newRV_noinc((SV*)ret_hash);`
`130`	`143`	`pfree(argv);`
	`144`	`+pfree(query);`
`131`	`145`	`OUTPUT:`
`132`	`146`	`RETVAL`
`133`	`147`
`134`	`148`	`SV*`
`135`		`-spi_spi_query_prepared(query, ...)`
`136`		`-char*query;`
	`149`	`+spi_spi_query_prepared(sv, ...)`
	`150`	`+SV*sv;`
`137`	`151`	`CODE:`
`138`	`152`	`inti;`
`139`	`153`	`SV**argv;`
	`154`	`+char*query=sv2cstr(sv);`
`140`	`155`	`if (items<1)`
`141`	`156`	`Perl_croak(aTHX_"Usage: spi_query_prepared(query, "`
`142`	`157`	`"[\\@bind_values])");`
`@@ -145,20 +160,25 @@ spi_spi_query_prepared(query, ...)`
`145`	`160`	`argv[i-1]=ST(i);`
`146`	`161`	`RETVAL=plperl_spi_query_prepared(query,items-1,argv);`
`147`	`162`	`pfree(argv);`
	`163`	`+pfree(query);`
`148`	`164`	`OUTPUT:`
`149`	`165`	`RETVAL`
`150`	`166`
`151`	`167`	`void`
`152`		`-spi_spi_freeplan(query)`
`153`		`-char*query;`
	`168`	`+spi_spi_freeplan(sv)`
	`169`	`+SV*sv;`
`154`	`170`	`CODE:`
	`171`	`+char*query=sv2cstr(sv);`
`155`	`172`	`plperl_spi_freeplan(query);`
	`173`	`+pfree(query);`
`156`	`174`
`157`	`175`	`void`
`158`		`-spi_spi_cursor_close(cursor)`
`159`		`-char*cursor;`
	`176`	`+spi_spi_cursor_close(sv)`
	`177`	`+SV*sv;`
`160`	`178`	`CODE:`
	`179`	`+char*cursor=sv2cstr(sv);`
`161`	`180`	`plperl_spi_cursor_close(cursor);`
	`181`	`+pfree(cursor);`
`162`	`182`
`163`	`183`
`164`	`184`	`BOOT:`

`‎src/pl/plperl/Util.xs`

Lines changed: 32 additions & 34 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`/* perl stuff */`
`23`	`23`	`#include"plperl.h"`
`24`		`-`
	`24`	`+#include"plperl_helpers.h"`
`25`	`25`
`26`	`26`	`/*`
`27`	`27`	`* Implementation of plperl's elog() function`
`@@ -34,13 +34,16 @@`
`34`	`34`	`* This is out-of-line to suppress "might be clobbered by longjmp" warnings.`
`35`	`35`	`*/`
`36`	`36`	`staticvoid`
`37`		`-do_util_elog(intlevel,char*message)`
	`37`	`+do_util_elog(intlevel,SV*msg)`
`38`	`38`	`{`
`39`	`39`	`MemoryContextoldcontext=CurrentMemoryContext;`
	`40`	`+char*cmsg=NULL;`
`40`	`41`
`41`	`42`	`PG_TRY();`
`42`	`43`	`{`
`43`		`-elog(level,"%s",message);`
	`44`	`+cmsg=sv2cstr(msg);`
	`45`	`+elog(level,"%s",cmsg);`
	`46`	`+pfree(cmsg);`
`44`	`47`	`}`
`45`	`48`	`PG_CATCH();`
`46`	`49`	`{`
`@@ -51,35 +54,20 @@ do_util_elog(int level, char *message)`
`51`	`54`	`edata=CopyErrorData();`
`52`	`55`	`FlushErrorState();`
`53`	`56`
	`57`	`+if (cmsg)`
	`58`	`+pfree(cmsg);`
	`59`	`+`
`54`	`60`	`/* Punt the error to Perl */`
`55`	`61`	`croak("%s",edata->message);`
`56`	`62`	`}`
`57`	`63`	`PG_END_TRY();`
`58`	`64`	`}`
`59`	`65`
`60`		`-staticSV*`
`61`		`-newSVstring_len(constchar*str,STRLENlen)`
`62`		`-{`
`63`		`-SV*sv;`
`64`		`-`
`65`		`-sv=newSVpvn(str,len);`
`66`		`-#ifPERL_BCDVERSION >=0x5006000L`
`67`		`-if (GetDatabaseEncoding()==PG_UTF8)`
`68`		`-SvUTF8_on(sv);`
`69`		`-#endif`
`70`		`-returnsv;`
`71`		`-}`
`72`		`-`
`73`	`66`	`statictext*`
`74`	`67`	`sv2text(SV*sv)`
`75`	`68`	`{`
`76`		`-STRLENsv_len;`
`77`		`-char*sv_pv;`
`78`		`-`
`79`		`-if (!sv)`
`80`		`-sv=&PL_sv_undef;`
`81`		`-sv_pv=SvPV(sv,sv_len);`
`82`		`-returncstring_to_text_with_len(sv_pv,sv_len);`
	`69`	`+char*str=sv2cstr(sv);`
	`70`	`+returncstring_to_text(str);`
`83`	`71`	`}`
`84`	`72`
`85`	`73`	`MODULE=PostgreSQL::InServer::UtilPREFIX=util_`
`@@ -105,15 +93,15 @@ _aliased_constants()`
`105`	`93`
`106`	`94`
`107`	`95`	`void`
`108`		`-util_elog(level,message)`
	`96`	`+util_elog(level,msg)`
`109`	`97`	`intlevel`
`110`		`-char*message`
	`98`	`+SV*msg`
`111`	`99`	`CODE:`
`112`	`100`	`if (level>ERROR)/* no PANIC allowed thanks */`
`113`	`101`	`level=ERROR;`
`114`	`102`	`if (level<DEBUG5)`
`115`	`103`	`level=DEBUG5;`
`116`		`-do_util_elog(level,message);`
	`104`	`+do_util_elog(level,msg);`
`117`	`105`
`118`	`106`	`SV*`
`119`	`107`	`util_quote_literal(sv)`
`@@ -125,7 +113,9 @@ util_quote_literal(sv)`
`125`	`113`	`else {`
`126`	`114`	`text*arg=sv2text(sv);`
`127`	`115`	`text*ret=DatumGetTextP(DirectFunctionCall1(quote_literal,PointerGetDatum(arg)));`
`128`		`-RETVAL=newSVstring_len(VARDATA(ret), (VARSIZE(ret)-VARHDRSZ));`
	`116`	`+char*str=text_to_cstring(ret);`
	`117`	`+RETVAL=cstr2sv(str);`
	`118`	`+pfree(str);`
`129`	`119`	`}`
`130`	`120`	`OUTPUT:`
`131`	`121`	`RETVAL`
`@@ -136,13 +126,15 @@ util_quote_nullable(sv)`
`136`	`126`	`CODE:`
`137`	`127`	`if (!sv\|\| !SvOK(sv))`
`138`	`128`	`{`
`139`		`-RETVAL=newSVstring_len("NULL",4);`
	`129`	`+RETVAL=cstr2sv("NULL");`
`140`	`130`	`}`
`141`	`131`	`else`
`142`	`132`	`{`
`143`	`133`	`text*arg=sv2text(sv);`
`144`	`134`	`text*ret=DatumGetTextP(DirectFunctionCall1(quote_nullable,PointerGetDatum(arg)));`
`145`		`-RETVAL=newSVstring_len(VARDATA(ret), (VARSIZE(ret)-VARHDRSZ));`
	`135`	`+char*str=text_to_cstring(ret);`
	`136`	`+RETVAL=cstr2sv(str);`
	`137`	`+pfree(str);`
`146`	`138`	`}`
`147`	`139`	`OUTPUT:`
`148`	`140`	`RETVAL`
`@@ -153,10 +145,13 @@ util_quote_ident(sv)`
`153`	`145`	`PREINIT:`
`154`	`146`	`text*arg;`
`155`	`147`	`text*ret;`
	`148`	`+char*str;`
`156`	`149`	`CODE:`
`157`	`150`	`arg=sv2text(sv);`
`158`	`151`	`ret=DatumGetTextP(DirectFunctionCall1(quote_ident,PointerGetDatum(arg)));`
`159`		`-RETVAL=newSVstring_len(VARDATA(ret), (VARSIZE(ret)-VARHDRSZ));`
	`152`	`+str=text_to_cstring(ret);`
	`153`	`+RETVAL=cstr2sv(str);`
	`154`	`+pfree(str);`
`160`	`155`	`OUTPUT:`
`161`	`156`	`RETVAL`
`162`	`157`
`@@ -167,9 +162,9 @@ util_decode_bytea(sv)`
`167`	`162`	`char*arg;`
`168`	`163`	`text*ret;`
`169`	`164`	`CODE:`
`170`		`-arg=SvPV_nolen(sv);`
	`165`	`+arg=SvPVbyte_nolen(sv);`
`171`	`166`	`ret=DatumGetTextP(DirectFunctionCall1(byteain,PointerGetDatum(arg)));`
`172`		`-/* notnewSVstring_len because this is raw bytes not utf8'able */`
	`167`	`+/* notcstr2sv because this is raw bytes not utf8'able */`
`173`	`168`	`RETVAL=newSVpvn(VARDATA(ret), (VARSIZE(ret)-VARHDRSZ));`
`174`	`169`	`OUTPUT:`
`175`	`170`	`RETVAL`
`@@ -180,10 +175,13 @@ util_encode_bytea(sv)`
`180`	`175`	`PREINIT:`
`181`	`176`	`text*arg;`
`182`	`177`	`char*ret;`
	`178`	`+STRLENlen;`
`183`	`179`	`CODE:`
`184`		`-arg=sv2text(sv);`
	`180`	`+/* not sv2text because this is raw bytes not utf8'able */`
	`181`	`+ret=SvPVbyte(sv,len);`
	`182`	`+arg=cstring_to_text_with_len(ret,len);`
`185`	`183`	`ret=DatumGetCString(DirectFunctionCall1(byteaout,PointerGetDatum(arg)));`
`186`		`-RETVAL=newSVstring_len(ret,strlen(ret));`
	`184`	`+RETVAL=cstr2sv(ret);`
`187`	`185`	`OUTPUT:`
`188`	`186`	`RETVAL`
`189`	`187`

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!

Commit50d89d4

File tree

5 files changed

5 files changed

`‎doc/src/sgml/plperl.sgml`

`‎src/pl/plperl/SPI.xs`

`‎src/pl/plperl/Util.xs`

0 commit comments