Commitb410475

committed

translate undef to NULL for result arrayref, now that we allow NULLs in arrays. Update plperl regression test accordingly.

1 parent33e9f2c commitb410475Copy full SHA for b410475

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,11 +412,11 @@ SELECT * FROM recurse(3);`
`412`	`412`	`---`
`413`	`413`	`CREATE OR REPLACE FUNCTION array_of_text() RETURNS TEXT[][]`
`414`	`414`	`LANGUAGE plperl as $$`
`415`		`- return [['a"b','c,d'],['e\\f','g']];`
	`415`	`+ return [['a"b',undef,'c,d'],['e\\f',undef,'g']];`
`416`	`416`	`$$;`
`417`	`417`	`SELECT array_of_text();`
`418`		`- array_of_text`
`419`		`------------------------------`
`420`		`- {{"a\"b","c,d"},{"e\\f",g}}`
	`418`	`+array_of_text`
	`419`	`+---------------------------------------`
	`420`	`+ {{"a\"b",NULL,"c,d"},{"e\\f",NULL,g}}`
`421`	`421`	`(1 row)`
`422`	`422`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* ENHANCEMENTS, OR MODIFICATIONS.`
`34`	`34`	`*`
`35`	`35`	`* IDENTIFICATION`
`36`		`- * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.94 2005/10/18 17:13:14 tgl Exp $`
	`36`	`+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.95 2005/11/18 17:00:28 adunstan Exp $`
`37`	`37`	`*`
`38`	`38`	`**********************************************************************/`
`39`	`39`
`@@ -207,12 +207,16 @@ plperl_init_all(void)`
`207`	`207`	`" { " \`
`208`	`208`	`" $res .= _plperl_to_pg_array($elem); " \`
`209`	`209`	`" } " \`
`210`		`-"else " \`
	`210`	`+"elsif (defined($elem)) " \`
`211`	`211`	`" { " \`
`212`	`212`	`" my $str = qq($elem); " \`
`213`	`213`	`" $str =~ s/([\"\\\\])/\\\\$1/g; " \`
`214`	`214`	`" $res .= qq(\"$str\"); " \`
`215`	`215`	`" } " \`
	`216`	`+" else " \`
	`217`	`+" { "\`
	`218`	`+" $res .= 'NULL' ; " \`
	`219`	`+" } "\`
`216`	`220`	`" } " \`
`217`	`221`	`" return qq({$res}); " \`
`218`	`222`	`"} "`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ SELECT * FROM recurse(3);`
`297`	`297`	`---`
`298`	`298`	`CREATE OR REPLACEFUNCTIONarray_of_text() RETURNSTEXT[][]`
`299`	`299`	`LANGUAGE plperlas $$`
`300`		`- return [['a"b','c,d'],['e\\f','g']];`
	`300`	`+ return [['a"b',undef,'c,d'],['e\\f',undef,'g']];`
`301`	`301`	`$$;`
`302`	`302`
`303`	`303`	`SELECT array_of_text();`

Comments

(0)