From e086197aaa8de484dafcb1cc991640980e252d70 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 15 Nov 2010 14:27:00 -0500 Subject: Fix aboriginal mistake in plpython's set-returning-function support. We must stay in the function's SPI context until done calling the iterator that returns the set result. Otherwise, any attempt to invoke SPI features in the python code called by the iterator will malfunction. Diagnosis and patch by Jan Urbanski, per bug report from Jean-Baptiste Quenot. Back-patch to 8.2; there was no support for SRFs in previous versions of plpython. --- src/pl/plpython/sql/plpython_setof.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/pl/plpython/sql') diff --git a/src/pl/plpython/sql/plpython_setof.sql b/src/pl/plpython/sql/plpython_setof.sql index 53d91a9e7d7..80a8d5b4c1e 100644 --- a/src/pl/plpython/sql/plpython_setof.sql +++ b/src/pl/plpython/sql/plpython_setof.sql @@ -35,6 +35,15 @@ class producer: return producer(count, content) $$ LANGUAGE plpythonu; +CREATE FUNCTION test_setof_spi_in_iterator() RETURNS SETOF text AS +$$ + for s in ('Hello', 'Brave', 'New', 'World'): + plpy.execute('select 1') + yield s + plpy.execute('select 2') +$$ +LANGUAGE plpythonu; + -- Test set returning functions SELECT test_setof_as_list(0, 'list'); @@ -51,3 +60,5 @@ SELECT test_setof_as_iterator(0, 'list'); SELECT test_setof_as_iterator(1, 'list'); SELECT test_setof_as_iterator(2, 'list'); SELECT test_setof_as_iterator(2, null); + +SELECT test_setof_spi_in_iterator(); -- cgit v1.2.3