Commita3401be

committed

Use different function names for plpython3 handlers, to avoid clashes in

pg_pltemplateThis should have a catversion bump, but it's still being debated whetherit's worth it during beta.

1 parente849b49 commita3401beCopy full SHA for a3401be

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`9`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/include/catalog/pg_pltemplate.h,v 1.13 2010/01/22 15:45:15 petere Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/include/catalog/pg_pltemplate.h,v 1.14 2010/06/29 00:18:11 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* the genbki.pl script reads this file and generates .bki`
`@@ -74,6 +74,6 @@ DATA(insert ( "plperl"t t "plperl_call_handler" "plperl_inline_handler" "plper`
`74`	`74`	`DATA(insert ("plperlu"ff"plperl_call_handler""plperl_inline_handler""plperl_validator""$libdir/plperl"_null_ ));`
`75`	`75`	`DATA(insert ("plpythonu"ff"plpython_call_handler""plpython_inline_handler"_null_"$libdir/plpython"_null_ ));`
`76`	`76`	`DATA(insert ("plpython2u"ff"plpython_call_handler""plpython_inline_handler"_null_"$libdir/plpython2"_null_ ));`
`77`		`-DATA(insert ("plpython3u"ff"plpython_call_handler""plpython_inline_handler"_null_"$libdir/plpython3"_null_ ));`
	`77`	`+DATA(insert ("plpython3u"ff"plpython3_call_handler""plpython3_inline_handler"_null_"$libdir/plpython3"_null_ ));`
`78`	`78`
`79`	`79`	`#endif/* PG_PLTEMPLATE_H */`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**********************************************************************`
`2`	`2`	`* plpython.c - python as a procedural language for PostgreSQL`
`3`	`3`	`*`
`4`		`- *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.144 2010/06/10 04:05:01 tgl Exp $`
	`4`	`+ *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.145 2010/06/29 00:18:11 petere Exp $`
`5`	`5`	`*`
`6`	`6`	`*********************************************************************`
`7`	`7`	`*/`
`@@ -244,6 +244,12 @@ typedef struct PLyResultObject`
`244`	`244`
`245`	`245`	`/* function declarations */`
`246`	`246`
	`247`	`+#ifPY_MAJOR_VERSION >=3`
	`248`	`+/* Use separate names to avoid clash in pg_pltemplate */`
	`249`	`+#defineplpython_call_handler plpython3_call_handler`
	`250`	`+#defineplpython_inline_handler plpython3_inline_handler`
	`251`	`+#endif`
	`252`	`+`
`247`	`253`	`/* exported functions */`
`248`	`254`	`Datumplpython_call_handler(PG_FUNCTION_ARGS);`
`249`	`255`	`Datumplpython_inline_handler(PG_FUNCTION_ARGS);`

Comments

(0)