Split the plpython regression test into test cases arranged by topic, instead

of the previous monolithic setup-create-run sequence, that was apparently
inherited from a previous test infrastructure, but makes working with the
tests and adding new ones weird.

14 files changed, 663 insertions, 656 deletions

diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
index b04b23ef95..04161bc25e 100644
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -1,18 +1,109 @@
-
 -- test error handling, i forgot to restore Warn_restart in
 -- the trigger handler once. the errors and subsequent core dump were
 -- interesting.
 
+/* Flat out syntax error
+ */
+CREATE FUNCTION sql_syntax_error() RETURNS text
+        AS
+'plpy.execute("syntax error")'
+        LANGUAGE plpythonu;
+
+SELECT sql_syntax_error();
+
+
+/* check the handling of uncaught python exceptions
+ */
+CREATE FUNCTION exception_index_invalid(text) RETURNS text
+	AS
+'return args[1]'
+	LANGUAGE plpythonu;
+
+SELECT exception_index_invalid('test');
+
+
+/* check handling of nested exceptions
+ */
+CREATE FUNCTION exception_index_invalid_nested() RETURNS text
+	AS
+'rv = plpy.execute("SELECT test5(''foo'')")
+return rv[0]'
+	LANGUAGE plpythonu;
+
+SELECT exception_index_invalid_nested();
+
+
+/* a typo
+ */
+CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text
+	AS
+'if not SD.has_key("plan"):
+	q = "SELECT fname FROM users WHERE lname = $1"
+	SD["plan"] = plpy.prepare(q, [ "test" ])
+rv = plpy.execute(SD["plan"], [ a ])
+if len(rv):
+	return rv[0]["fname"]
+return None
+'
+	LANGUAGE plpythonu;
+
 SELECT invalid_type_uncaught('rick');
+
+
+/* for what it's worth catch the exception generated by
+ * the typo, and return None
+ */
+CREATE FUNCTION invalid_type_caught(a text) RETURNS text
+	AS
+'if not SD.has_key("plan"):
+	q = "SELECT fname FROM users WHERE lname = $1"
+	try:
+		SD["plan"] = plpy.prepare(q, [ "test" ])
+	except plpy.SPIError, ex:
+		plpy.notice(str(ex))
+		return None
+rv = plpy.execute(SD["plan"], [ a ])
+if len(rv):
+	return rv[0]["fname"]
+return None
+'
+	LANGUAGE plpythonu;
+
 SELECT invalid_type_caught('rick');
+
+
+/* for what it's worth catch the exception generated by
+ * the typo, and reraise it as a plain error
+ */
+CREATE FUNCTION invalid_type_reraised(a text) RETURNS text
+	AS
+'if not SD.has_key("plan"):
+	q = "SELECT fname FROM users WHERE lname = $1"
+	try:
+		SD["plan"] = plpy.prepare(q, [ "test" ])
+	except plpy.SPIError, ex:
+		plpy.error(str(ex))
+rv = plpy.execute(SD["plan"], [ a ])
+if len(rv):
+	return rv[0]["fname"]
+return None
+'
+	LANGUAGE plpythonu;
+
 SELECT invalid_type_reraised('rick');
-SELECT valid_type('rick');
 
---
--- Test Unicode error handling.
---
 
-SELECT unicode_return_error();
-INSERT INTO unicode_test (testvalue) VALUES ('test');
-SELECT unicode_plan_error1();
-SELECT unicode_plan_error2();
+/* no typo no messing about
+ */
+CREATE FUNCTION valid_type(a text) RETURNS text
+	AS
+'if not SD.has_key("plan"):
+	SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ])
+rv = plpy.execute(SD["plan"], [ a ])
+if len(rv):
+	return rv[0]["fname"]
+return None
+'
+	LANGUAGE plpythonu;
+
+SELECT valid_type('rick');
diff --git a/src/pl/plpython/sql/plpython_function.sql b/src/pl/plpython/sql/plpython_function.sql
deleted file mode 100644
index a1544f3c42..0000000000
--- a/src/pl/plpython/sql/plpython_function.sql
+++ /dev/null
@@ -1,499 +0,0 @@
-
-
-CREATE FUNCTION global_test_one() returns text
-    AS
-'if not SD.has_key("global_test"):
-	SD["global_test"] = "set by global_test_one"
-if not GD.has_key("global_test"):
-	GD["global_test"] = "set by global_test_one"
-return "SD: " + SD["global_test"] + ", GD: " + GD["global_test"]'
-    LANGUAGE plpythonu;
-
-CREATE FUNCTION global_test_two() returns text
-    AS
-'if not SD.has_key("global_test"):
-	SD["global_test"] = "set by global_test_two"
-if not GD.has_key("global_test"):
-	GD["global_test"] = "set by global_test_two"
-return "SD: " + SD["global_test"] + ", GD: " + GD["global_test"]'
-    LANGUAGE plpythonu;
-
-
-CREATE FUNCTION static_test() returns int4
-    AS
-'if SD.has_key("call"):
-	SD["call"] = SD["call"] + 1
-else:
-	SD["call"] = 1
-return SD["call"]
-'
-    LANGUAGE plpythonu;
-
--- import python modules
-
-CREATE FUNCTION import_fail() returns text
-    AS
-'try:
-	import foosocket
-except Exception, ex:
-	plpy.notice("import socket failed -- %s" % str(ex))
-	return "failed as expected"
-return "succeeded, that wasn''t supposed to happen"'
-    LANGUAGE plpythonu;
-
-
-CREATE FUNCTION import_succeed() returns text
-	AS
-'try:
-  import array
-  import bisect
-  import calendar
-  import cmath
-  import errno
-  import math
-  import md5
-  import operator
-  import random
-  import re
-  import sha
-  import string
-  import time
-except Exception, ex:
-	plpy.notice("import failed -- %s" % str(ex))
-	return "failed, that wasn''t supposed to happen"
-return "succeeded, as expected"'
-    LANGUAGE plpythonu;
-
-CREATE FUNCTION import_test_one(p text) RETURNS text
-	AS
-'import sha
-digest = sha.new(p)
-return digest.hexdigest()'
-	LANGUAGE plpythonu;
-
-CREATE FUNCTION import_test_two(u users) RETURNS text
-	AS
-'import sha
-plain = u["fname"] + u["lname"]
-digest = sha.new(plain);
-return "sha hash of " + plain + " is " + digest.hexdigest()'
-	LANGUAGE plpythonu;
-
-CREATE FUNCTION argument_test_one(u users, a1 text, a2 text) RETURNS text
-	AS
-'keys = u.keys()
-keys.sort()
-out = []
-for key in keys:
-    out.append("%s: %s" % (key, u[key]))
-words = a1 + " " + a2 + " => {" + ", ".join(out) + "}"
-return words'
-	LANGUAGE plpythonu;
-
-
--- these triggers are dedicated to HPHC of RI who
--- decided that my kid's name was william not willem, and
--- vigorously resisted all efforts at correction.  they have
--- since gone bankrupt...
-
-CREATE FUNCTION users_insert() returns trigger
-	AS
-'if TD["new"]["fname"] == None or TD["new"]["lname"] == None:
-	return "SKIP"
-if TD["new"]["username"] == None:
-	TD["new"]["username"] = TD["new"]["fname"][:1] + "_" + TD["new"]["lname"]
-	rv = "MODIFY"
-else:
-	rv = None
-if TD["new"]["fname"] == "william":
-	TD["new"]["fname"] = TD["args"][0]
-	rv = "MODIFY"
-return rv'
-	LANGUAGE plpythonu;
-
-
-CREATE FUNCTION users_update() returns trigger
-	AS
-'if TD["event"] == "UPDATE":
-	if TD["old"]["fname"] != TD["new"]["fname"] and TD["old"]["fname"] == TD["args"][0]:
-		return "SKIP"
-return None'
-	LANGUAGE plpythonu;
-
-
-CREATE FUNCTION users_delete() RETURNS trigger
-	AS
-'if TD["old"]["fname"] == TD["args"][0]:
-	return "SKIP"
-return None'
-	LANGUAGE plpythonu;
-
-
-CREATE TRIGGER users_insert_trig BEFORE INSERT ON users FOR EACH ROW
-	EXECUTE PROCEDURE users_insert ('willem');
-
-CREATE TRIGGER users_update_trig BEFORE UPDATE ON users FOR EACH ROW
-	EXECUTE PROCEDURE users_update ('willem');
-
-CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
-	EXECUTE PROCEDURE users_delete ('willem');
-
-
-
--- dump trigger data
-
-CREATE TABLE trigger_test
-	(i int, v text );
-
-CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
-
-if TD.has_key('relid'):
-	TD['relid'] = "bogus:12345"
-
-skeys = TD.keys()
-skeys.sort()
-for key in skeys:
-	val = TD[key]
-	plpy.notice("TD[" + key + "] => " + str(val))
-
-return None  
-
-$$;
-
-CREATE TRIGGER show_trigger_data_trig 
-BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
-FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
-
-insert into trigger_test values(1,'insert');
-update trigger_test set v = 'update' where i = 1;
-delete from trigger_test;
-      
-DROP TRIGGER show_trigger_data_trig on trigger_test;
-      
-DROP FUNCTION trigger_data();
-
--- nested calls
---
-
-CREATE FUNCTION nested_call_one(a text) RETURNS text
-	AS
-'q = "SELECT nested_call_two(''%s'')" % a
-r = plpy.execute(q)
-return r[0]'
-	LANGUAGE plpythonu ;
-
-CREATE FUNCTION nested_call_two(a text) RETURNS text
-	AS
-'q = "SELECT nested_call_three(''%s'')" % a
-r = plpy.execute(q)
-return r[0]'
-	LANGUAGE plpythonu ;
-
-CREATE FUNCTION nested_call_three(a text) RETURNS text
-	AS
-'return a'
-	LANGUAGE plpythonu ;
-
--- some spi stuff
-
-CREATE FUNCTION spi_prepared_plan_test_one(a text) RETURNS text
-	AS
-'if not SD.has_key("myplan"):
-	q = "SELECT count(*) FROM users WHERE lname = $1"
-	SD["myplan"] = plpy.prepare(q, [ "text" ])
-try:
-	rv = plpy.execute(SD["myplan"], [a])
-	return "there are " + str(rv[0]["count"]) + " " + str(a) + "s"
-except Exception, ex:
-	plpy.error(str(ex))
-return None
-'
-	LANGUAGE plpythonu;
-
-CREATE FUNCTION spi_prepared_plan_test_nested(a text) RETURNS text
-	AS
-'if not SD.has_key("myplan"):
-	q = "SELECT spi_prepared_plan_test_one(''%s'') as count" % a
-	SD["myplan"] = plpy.prepare(q)
-try:
-	rv = plpy.execute(SD["myplan"])
-	if len(rv):
-		return rv[0]["count"]
-except Exception, ex:
-	plpy.error(str(ex))
-return None
-'
-	LANGUAGE plpythonu;
-
-
-/* really stupid function just to get the module loaded
-*/
-CREATE FUNCTION stupid() RETURNS text AS 'return "zarkon"' LANGUAGE plpythonu;
-
-/* a typo
-*/
-CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text
-	AS
-'if not SD.has_key("plan"):
-	q = "SELECT fname FROM users WHERE lname = $1"
-	SD["plan"] = plpy.prepare(q, [ "test" ])
-rv = plpy.execute(SD["plan"], [ a ])
-if len(rv):
-	return rv[0]["fname"]
-return None
-'
-	LANGUAGE plpythonu;
-
-/* for what it's worth catch the exception generated by
- * the typo, and return None
- */
-CREATE FUNCTION invalid_type_caught(a text) RETURNS text
-	AS
-'if not SD.has_key("plan"):
-	q = "SELECT fname FROM users WHERE lname = $1"
-	try:
-		SD["plan"] = plpy.prepare(q, [ "test" ])
-	except plpy.SPIError, ex:
-		plpy.notice(str(ex))
-		return None
-rv = plpy.execute(SD["plan"], [ a ])
-if len(rv):
-	return rv[0]["fname"]
-return None
-'
-	LANGUAGE plpythonu;
-
-/* for what it's worth catch the exception generated by
- * the typo, and reraise it as a plain error
- */
-CREATE FUNCTION invalid_type_reraised(a text) RETURNS text
-	AS
-'if not SD.has_key("plan"):
-	q = "SELECT fname FROM users WHERE lname = $1"
-	try:
-		SD["plan"] = plpy.prepare(q, [ "test" ])
-	except plpy.SPIError, ex:
-		plpy.error(str(ex))
-rv = plpy.execute(SD["plan"], [ a ])
-if len(rv):
-	return rv[0]["fname"]
-return None
-'
-	LANGUAGE plpythonu;
-
-
-/* no typo no messing about
-*/
-CREATE FUNCTION valid_type(a text) RETURNS text
-	AS
-'if not SD.has_key("plan"):
-	SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ])
-rv = plpy.execute(SD["plan"], [ a ])
-if len(rv):
-	return rv[0]["fname"]
-return None
-'
-	LANGUAGE plpythonu;
-/* Flat out syntax error
-*/
-CREATE FUNCTION sql_syntax_error() RETURNS text
-        AS
-'plpy.execute("syntax error")'
-        LANGUAGE plpythonu;
-
-/* check the handling of uncaught python exceptions
- */
-CREATE FUNCTION exception_index_invalid(text) RETURNS text
-	AS
-'return args[1]'
-	LANGUAGE plpythonu;
-
-/* check handling of nested exceptions
- */
-CREATE FUNCTION exception_index_invalid_nested() RETURNS text
-	AS
-'rv = plpy.execute("SELECT test5(''foo'')")
-return rv[0]'
-	LANGUAGE plpythonu;
-
-
-CREATE FUNCTION join_sequences(s sequences) RETURNS text
-	AS
-'if not s["multipart"]:
-	return s["sequence"]
-q = "SELECT sequence FROM xsequences WHERE pid = ''%s''" % s["pid"]
-rv = plpy.execute(q)
-seq = s["sequence"]
-for r in rv:
-	seq = seq + r["sequence"]
-return seq
-'
-	LANGUAGE plpythonu;
-
---
--- Universal Newline Support
--- 
-
-CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
-E'x = 100\ny = 23\nreturn x + y\n'
-LANGUAGE plpythonu;
-
-CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
-E'x = 100\ry = 23\rreturn x + y\r'
-LANGUAGE plpythonu;
-
-CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
-E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
-LANGUAGE plpythonu;
-
---
--- Unicode error handling
---
-
-CREATE FUNCTION unicode_return_error() RETURNS text AS E'
-return u"\\x80"
-' LANGUAGE plpythonu;
-
-CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS E'
-TD["new"]["testvalue"] = u"\\x80"
-return "MODIFY"
-' LANGUAGE plpythonu;
-
-CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
-  FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
-
-CREATE FUNCTION unicode_plan_error1() RETURNS text AS E'
-plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
-rv = plpy.execute(plan, [u"\\x80"], 1)
-return rv[0]["testvalue"]
-' LANGUAGE plpythonu;
-
-CREATE FUNCTION unicode_plan_error2() RETURNS text AS E'
-plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
-rv = plpy.execute(plan, u"\\x80", 1)
-return rv[0]["testvalue1"]
-' LANGUAGE plpythonu;
-
--- Tests for functions that return void
-
-CREATE FUNCTION test_void_func1() RETURNS void AS $$
-x = 10
-$$ LANGUAGE plpythonu;
-
--- illegal: can't return non-None value in void-returning func
-CREATE FUNCTION test_void_func2() RETURNS void AS $$
-return 10
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_return_none() RETURNS int AS $$
-None
-$$ LANGUAGE plpythonu;
-
-
---
--- Test named and nameless parameters
---
-CREATE FUNCTION test_param_names0(integer, integer) RETURNS int AS $$
-return args[0] + args[1]
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_param_names1(a0 integer, a1 text) RETURNS boolean AS $$
-assert a0 == args[0]
-assert a1 == args[1]
-return True
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_param_names2(u users) RETURNS text AS $$
-assert u == args[0]
-return str(u)
-$$ LANGUAGE plpythonu;
-
--- use deliberately wrong parameter names
-CREATE FUNCTION test_param_names3(a0 integer) RETURNS boolean AS $$
-try:
-	assert a1 == args[0]
-	return False
-except NameError, e:
-	assert e.args[0].find("a1") > -1
-	return True
-$$ LANGUAGE plpythonu;
-
-
---
--- Test returning SETOF
---
-CREATE FUNCTION test_setof_as_list(count integer, content text) RETURNS SETOF text AS $$
-return [ content ]*count
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_setof_as_tuple(count integer, content text) RETURNS SETOF text AS $$
-t = ()
-for i in xrange(count):
-	t += ( content, )
-return t
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_setof_as_iterator(count integer, content text) RETURNS SETOF text AS $$
-class producer:
-	def __init__ (self, icount, icontent):
-		self.icontent = icontent
-		self.icount = icount
-	def __iter__ (self):
-		return self
-	def next (self):
-		if self.icount == 0:
-			raise StopIteration
-		self.icount -= 1
-		return self.icontent
-return producer(count, content)
-$$ LANGUAGE plpythonu;
-
-
---
--- Test returning tuples
---
-CREATE FUNCTION test_table_record_as(typ text, first text, second integer, retnull boolean) RETURNS table_record AS $$
-if retnull:
-	return None
-if typ == 'dict':
-	return { 'first': first, 'second': second, 'additionalfield': 'must not cause trouble' }
-elif typ == 'tuple':
-	return ( first, second )
-elif typ == 'list':
-	return [ first, second ]
-elif typ == 'obj':
-	class type_record: pass
-	type_record.first = first
-	type_record.second = second
-	return type_record
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_type_record_as(typ text, first text, second integer, retnull boolean) RETURNS type_record AS $$
-if retnull:
-	return None
-if typ == 'dict':
-	return { 'first': first, 'second': second, 'additionalfield': 'must not cause trouble' }
-elif typ == 'tuple':
-	return ( first, second )
-elif typ == 'list':
-	return [ first, second ]
-elif typ == 'obj':
-	class type_record: pass
-	type_record.first = first
-	type_record.second = second
-	return type_record
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_in_out_params(first in text, second out text) AS $$
-return first + '_in_to_out';
-$$ LANGUAGE plpythonu;
-
--- this doesn't work yet :-(
-CREATE FUNCTION test_in_out_params_multi(first in text,
-                                         second out text, third out text) AS $$
-return first + '_record_in_to_out';
-$$ LANGUAGE plpythonu;
-
-CREATE FUNCTION test_inout_params(first inout text) AS $$
-return first + '_inout';
-$$ LANGUAGE plpythonu;
diff --git a/src/pl/plpython/sql/plpython_global.sql b/src/pl/plpython/sql/plpython_global.sql
new file mode 100644
index 0000000000..e676ad6f43
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_global.sql
@@ -0,0 +1,38 @@
+--
+-- check static and global data (SD and GD)
+--
+
+CREATE FUNCTION global_test_one() returns text
+    AS
+'if not SD.has_key("global_test"):
+	SD["global_test"] = "set by global_test_one"
+if not GD.has_key("global_test"):
+	GD["global_test"] = "set by global_test_one"
+return "SD: " + SD["global_test"] + ", GD: " + GD["global_test"]'
+    LANGUAGE plpythonu;
+
+CREATE FUNCTION global_test_two() returns text
+    AS
+'if not SD.has_key("global_test"):
+	SD["global_test"] = "set by global_test_two"
+if not GD.has_key("global_test"):
+	GD["global_test"] = "set by global_test_two"
+return "SD: " + SD["global_test"] + ", GD: " + GD["global_test"]'
+    LANGUAGE plpythonu;
+
+
+CREATE FUNCTION static_test() returns int4
+    AS
+'if SD.has_key("call"):
+	SD["call"] = SD["call"] + 1
+else:
+	SD["call"] = 1
+return SD["call"]
+'
+    LANGUAGE plpythonu;
+
+
+SELECT static_test();
+SELECT static_test();
+SELECT global_test_one();
+SELECT global_test_two();
diff --git a/src/pl/plpython/sql/plpython_import.sql b/src/pl/plpython/sql/plpython_import.sql
new file mode 100644
index 0000000000..7830dd7362
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_import.sql
@@ -0,0 +1,63 @@
+-- import python modules
+
+CREATE FUNCTION import_fail() returns text
+    AS
+'try:
+	import foosocket
+except Exception, ex:
+	plpy.notice("import socket failed -- %s" % str(ex))
+	return "failed as expected"
+return "succeeded, that wasn''t supposed to happen"'
+    LANGUAGE plpythonu;
+
+
+CREATE FUNCTION import_succeed() returns text
+	AS
+'try:
+  import array
+  import bisect
+  import calendar
+  import cmath
+  import errno
+  import math
+  import md5
+  import operator
+  import random
+  import re
+  import sha
+  import string
+  import time
+except Exception, ex:
+	plpy.notice("import failed -- %s" % str(ex))
+	return "failed, that wasn''t supposed to happen"
+return "succeeded, as expected"'
+    LANGUAGE plpythonu;
+
+CREATE FUNCTION import_test_one(p text) RETURNS text
+	AS
+'import sha
+digest = sha.new(p)
+return digest.hexdigest()'
+	LANGUAGE plpythonu;
+
+CREATE FUNCTION import_test_two(u users) RETURNS text
+	AS
+'import sha
+plain = u["fname"] + u["lname"]
+digest = sha.new(plain);
+return "sha hash of " + plain + " is " + digest.hexdigest()'
+	LANGUAGE plpythonu;
+
+
+-- import python modules
+--
+SELECT import_fail();
+SELECT import_succeed();
+
+-- test import and simple argument handling
+--
+SELECT import_test_one('sha hash of this string');
+
+-- test import and tuple argument handling
+--
+select import_test_two(users) from users where fname = 'willem';
diff --git a/src/pl/plpython/sql/plpython_newline.sql b/src/pl/plpython/sql/plpython_newline.sql
new file mode 100644
index 0000000000..6263fac141
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_newline.sql
@@ -0,0 +1,20 @@
+--
+-- Universal Newline Support
+-- 
+
+CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
+E'x = 100\ny = 23\nreturn x + y\n'
+LANGUAGE plpythonu;
+
+CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
+E'x = 100\ry = 23\rreturn x + y\r'
+LANGUAGE plpythonu;
+
+CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
+E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
+LANGUAGE plpythonu;
+
+
+SELECT newline_lf();
+SELECT newline_cr();
+SELECT newline_crlf();
diff --git a/src/pl/plpython/sql/plpython_params.sql b/src/pl/plpython/sql/plpython_params.sql
new file mode 100644
index 0000000000..f8b610b505
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_params.sql
@@ -0,0 +1,34 @@
+--
+-- Test named and nameless parameters
+--
+
+CREATE FUNCTION test_param_names0(integer, integer) RETURNS int AS $$
+return args[0] + args[1]
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_param_names1(a0 integer, a1 text) RETURNS boolean AS $$
+assert a0 == args[0]
+assert a1 == args[1]
+return True
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_param_names2(u users) RETURNS text AS $$
+assert u == args[0]
+return str(u)
+$$ LANGUAGE plpythonu;
+
+-- use deliberately wrong parameter names
+CREATE FUNCTION test_param_names3(a0 integer) RETURNS boolean AS $$
+try:
+	assert a1 == args[0]
+	return False
+except NameError, e:
+	assert e.args[0].find("a1") > -1
+	return True
+$$ LANGUAGE plpythonu;
+
+
+SELECT test_param_names0(2,7);
+SELECT test_param_names1(1,'text');
+SELECT test_param_names2(users) from users;
+SELECT test_param_names3(1);
diff --git a/src/pl/plpython/sql/plpython_record.sql b/src/pl/plpython/sql/plpython_record.sql
new file mode 100644
index 0000000000..5bd8102107
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_record.sql
@@ -0,0 +1,104 @@
+--
+-- Test returning tuples
+--
+
+CREATE FUNCTION test_table_record_as(typ text, first text, second integer, retnull boolean) RETURNS table_record AS $$
+if retnull:
+	return None
+if typ == 'dict':
+	return { 'first': first, 'second': second, 'additionalfield': 'must not cause trouble' }
+elif typ == 'tuple':
+	return ( first, second )
+elif typ == 'list':
+	return [ first, second ]
+elif typ == 'obj':
+	class type_record: pass
+	type_record.first = first
+	type_record.second = second
+	return type_record
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_type_record_as(typ text, first text, second integer, retnull boolean) RETURNS type_record AS $$
+if retnull:
+	return None
+if typ == 'dict':
+	return { 'first': first, 'second': second, 'additionalfield': 'must not cause trouble' }
+elif typ == 'tuple':
+	return ( first, second )
+elif typ == 'list':
+	return [ first, second ]
+elif typ == 'obj':
+	class type_record: pass
+	type_record.first = first
+	type_record.second = second
+	return type_record
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_in_out_params(first in text, second out text) AS $$
+return first + '_in_to_out';
+$$ LANGUAGE plpythonu;
+
+-- this doesn't work yet :-(
+CREATE FUNCTION test_in_out_params_multi(first in text,
+                                         second out text, third out text) AS $$
+return first + '_record_in_to_out';
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_inout_params(first inout text) AS $$
+return first + '_inout';
+$$ LANGUAGE plpythonu;
+
+
+-- Test tuple returning functions
+SELECT * FROM test_table_record_as('dict', null, null, false);
+SELECT * FROM test_table_record_as('dict', 'one', null, false);
+SELECT * FROM test_table_record_as('dict', null, 2, false);
+SELECT * FROM test_table_record_as('dict', 'three', 3, false);
+SELECT * FROM test_table_record_as('dict', null, null, true);
+
+SELECT * FROM test_table_record_as('tuple', null, null, false);
+SELECT * FROM test_table_record_as('tuple', 'one', null, false);
+SELECT * FROM test_table_record_as('tuple', null, 2, false);
+SELECT * FROM test_table_record_as('tuple', 'three', 3, false);
+SELECT * FROM test_table_record_as('tuple', null, null, true);
+
+SELECT * FROM test_table_record_as('list', null, null, false);
+SELECT * FROM test_table_record_as('list', 'one', null, false);
+SELECT * FROM test_table_record_as('list', null, 2, false);
+SELECT * FROM test_table_record_as('list', 'three', 3, false);
+SELECT * FROM test_table_record_as('list', null, null, true);
+
+SELECT * FROM test_table_record_as('obj', null, null, false);
+SELECT * FROM test_table_record_as('obj', 'one', null, false);
+SELECT * FROM test_table_record_as('obj', null, 2, false);
+SELECT * FROM test_table_record_as('obj', 'three', 3, false);
+SELECT * FROM test_table_record_as('obj', null, null, true);
+
+SELECT * FROM test_type_record_as('dict', null, null, false);
+SELECT * FROM test_type_record_as('dict', 'one', null, false);
+SELECT * FROM test_type_record_as('dict', null, 2, false);
+SELECT * FROM test_type_record_as('dict', 'three', 3, false);
+SELECT * FROM test_type_record_as('dict', null, null, true);
+
+SELECT * FROM test_type_record_as('tuple', null, null, false);
+SELECT * FROM test_type_record_as('tuple', 'one', null, false);
+SELECT * FROM test_type_record_as('tuple', null, 2, false);
+SELECT * FROM test_type_record_as('tuple', 'three', 3, false);
+SELECT * FROM test_type_record_as('tuple', null, null, true);
+
+SELECT * FROM test_type_record_as('list', null, null, false);
+SELECT * FROM test_type_record_as('list', 'one', null, false);
+SELECT * FROM test_type_record_as('list', null, 2, false);
+SELECT * FROM test_type_record_as('list', 'three', 3, false);
+SELECT * FROM test_type_record_as('list', null, null, true);
+
+SELECT * FROM test_type_record_as('obj', null, null, false);
+SELECT * FROM test_type_record_as('obj', 'one', null, false);
+SELECT * FROM test_type_record_as('obj', null, 2, false);
+SELECT * FROM test_type_record_as('obj', 'three', 3, false);
+SELECT * FROM test_type_record_as('obj', null, null, true);
+
+SELECT * FROM test_in_out_params('test_in');
+-- this doesn't work yet :-(
+SELECT * FROM test_in_out_params_multi('test_in');
+SELECT * FROM test_inout_params('test_in');
diff --git a/src/pl/plpython/sql/plpython_schema.sql b/src/pl/plpython/sql/plpython_schema.sql
index c346c40381..92681c1662 100644
--- a/src/pl/plpython/sql/plpython_schema.sql
+++ b/src/pl/plpython/sql/plpython_schema.sql
@@ -39,10 +39,6 @@ CREATE TABLE xsequences (
 	) ;
 CREATE INDEX xsequences_pid_idx ON xsequences(pid) ;
 
-CREATE TABLE unicode_test (
-	testvalue  text NOT NULL
-);
-
 CREATE TABLE table_record (
 	first text,
 	second int4
diff --git a/src/pl/plpython/sql/plpython_setof.sql b/src/pl/plpython/sql/plpython_setof.sql
new file mode 100644
index 0000000000..881d90222f
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_setof.sql
@@ -0,0 +1,46 @@
+--
+-- Test returning SETOF
+--
+
+CREATE FUNCTION test_setof_as_list(count integer, content text) RETURNS SETOF text AS $$
+return [ content ]*count
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_setof_as_tuple(count integer, content text) RETURNS SETOF text AS $$
+t = ()
+for i in xrange(count):
+	t += ( content, )
+return t
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_setof_as_iterator(count integer, content text) RETURNS SETOF text AS $$
+class producer:
+	def __init__ (self, icount, icontent):
+		self.icontent = icontent
+		self.icount = icount
+	def __iter__ (self):
+		return self
+	def next (self):
+		if self.icount == 0:
+			raise StopIteration
+		self.icount -= 1
+		return self.icontent
+return producer(count, content)
+$$ LANGUAGE plpythonu;
+
+
+-- Test set returning functions
+SELECT test_setof_as_list(0, 'list');
+SELECT test_setof_as_list(1, 'list');
+SELECT test_setof_as_list(2, 'list');
+SELECT test_setof_as_list(2, null);
+
+SELECT test_setof_as_tuple(0, 'tuple');
+SELECT test_setof_as_tuple(1, 'tuple');
+SELECT test_setof_as_tuple(2, 'tuple');
+SELECT test_setof_as_tuple(2, null);
+
+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);
diff --git a/src/pl/plpython/sql/plpython_spi.sql b/src/pl/plpython/sql/plpython_spi.sql
new file mode 100644
index 0000000000..866a0d5feb
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_spi.sql
@@ -0,0 +1,90 @@
+
+
+-- nested calls
+--
+
+CREATE FUNCTION nested_call_one(a text) RETURNS text
+	AS
+'q = "SELECT nested_call_two(''%s'')" % a
+r = plpy.execute(q)
+return r[0]'
+	LANGUAGE plpythonu ;
+
+CREATE FUNCTION nested_call_two(a text) RETURNS text
+	AS
+'q = "SELECT nested_call_three(''%s'')" % a
+r = plpy.execute(q)
+return r[0]'
+	LANGUAGE plpythonu ;
+
+CREATE FUNCTION nested_call_three(a text) RETURNS text
+	AS
+'return a'
+	LANGUAGE plpythonu ;
+
+-- some spi stuff
+
+CREATE FUNCTION spi_prepared_plan_test_one(a text) RETURNS text
+	AS
+'if not SD.has_key("myplan"):
+	q = "SELECT count(*) FROM users WHERE lname = $1"
+	SD["myplan"] = plpy.prepare(q, [ "text" ])
+try:
+	rv = plpy.execute(SD["myplan"], [a])
+	return "there are " + str(rv[0]["count"]) + " " + str(a) + "s"
+except Exception, ex:
+	plpy.error(str(ex))
+return None
+'
+	LANGUAGE plpythonu;
+
+CREATE FUNCTION spi_prepared_plan_test_nested(a text) RETURNS text
+	AS
+'if not SD.has_key("myplan"):
+	q = "SELECT spi_prepared_plan_test_one(''%s'') as count" % a
+	SD["myplan"] = plpy.prepare(q)
+try:
+	rv = plpy.execute(SD["myplan"])
+	if len(rv):
+		return rv[0]["count"]
+except Exception, ex:
+	plpy.error(str(ex))
+return None
+'
+	LANGUAGE plpythonu;
+
+
+
+
+CREATE FUNCTION join_sequences(s sequences) RETURNS text
+	AS
+'if not s["multipart"]:
+	return s["sequence"]
+q = "SELECT sequence FROM xsequences WHERE pid = ''%s''" % s["pid"]
+rv = plpy.execute(q)
+seq = s["sequence"]
+for r in rv:
+	seq = seq + r["sequence"]
+return seq
+'
+	LANGUAGE plpythonu;
+
+
+
+
+
+-- spi and nested calls
+--
+select nested_call_one('pass this along');
+select spi_prepared_plan_test_one('doe');
+select spi_prepared_plan_test_one('smith');
+select spi_prepared_plan_test_nested('smith');
+
+
+
+
+SELECT join_sequences(sequences) FROM sequences;
+SELECT join_sequences(sequences) FROM sequences
+	WHERE join_sequences(sequences) ~* '^A';
+SELECT join_sequences(sequences) FROM sequences
+	WHERE join_sequences(sequences) ~* '^B';
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
index 633d940e5d..38e236f146 100644
--- a/src/pl/plpython/sql/plpython_test.sql
+++ b/src/pl/plpython/sql/plpython_test.sql
@@ -1,151 +1,21 @@
 -- first some tests of basic functionality
---
--- better succeed
---
-select stupid();
-
--- check static and global data
---
-SELECT static_test();
-SELECT static_test();
-SELECT global_test_one();
-SELECT global_test_two();
 
--- import python modules
---
-SELECT import_fail();
-SELECT import_succeed();
+-- really stupid function just to get the module loaded
+CREATE FUNCTION stupid() RETURNS text AS 'return "zarkon"' LANGUAGE plpythonu;
 
--- test import and simple argument handling
---
-SELECT import_test_one('sha hash of this string');
+select stupid();
 
--- test import and tuple argument handling
---
-select import_test_two(users) from users where fname = 'willem';
 
 -- test multiple arguments
---
-select argument_test_one(users, fname, lname) from users where lname = 'doe' order by 1;
-
-
--- spi and nested calls
---
-select nested_call_one('pass this along');
-select spi_prepared_plan_test_one('doe');
-select spi_prepared_plan_test_one('smith');
-select spi_prepared_plan_test_nested('smith');
-
--- quick peek at the table
---
-SELECT * FROM users;
-
--- should fail
---
-UPDATE users SET fname = 'william' WHERE fname = 'willem';
-
--- should modify william to willem and create username
---
-INSERT INTO users (fname, lname) VALUES ('william', 'smith');
-INSERT INTO users (fname, lname, username) VALUES ('charles', 'darwin', 'beagle');
-
-SELECT * FROM users;
-
-
-SELECT join_sequences(sequences) FROM sequences;
-SELECT join_sequences(sequences) FROM sequences
-	WHERE join_sequences(sequences) ~* '^A';
-SELECT join_sequences(sequences) FROM sequences
-	WHERE join_sequences(sequences) ~* '^B';
-
--- error in trigger
---
-
---
--- Check Universal Newline Support
---
-
-SELECT newline_lf();
-SELECT newline_cr();
-SELECT newline_crlf();
+CREATE FUNCTION argument_test_one(u users, a1 text, a2 text) RETURNS text
+	AS
+'keys = u.keys()
+keys.sort()
+out = []
+for key in keys:
+    out.append("%s: %s" % (key, u[key]))
+words = a1 + " " + a2 + " => {" + ", ".join(out) + "}"
+return words'
+	LANGUAGE plpythonu;
 
--- Tests for functions returning void
-SELECT test_void_func1(), test_void_func1() IS NULL AS "is null";
-SELECT test_void_func2(); -- should fail
-SELECT test_return_none(), test_return_none() IS NULL AS "is null";
-
--- Test for functions with named and nameless parameters
-SELECT test_param_names0(2,7);
-SELECT test_param_names1(1,'text');
-SELECT test_param_names2(users) from users;
-SELECT test_param_names3(1);
-
--- Test set returning functions
-SELECT test_setof_as_list(0, 'list');
-SELECT test_setof_as_list(1, 'list');
-SELECT test_setof_as_list(2, 'list');
-SELECT test_setof_as_list(2, null);
-
-SELECT test_setof_as_tuple(0, 'tuple');
-SELECT test_setof_as_tuple(1, 'tuple');
-SELECT test_setof_as_tuple(2, 'tuple');
-SELECT test_setof_as_tuple(2, null);
-
-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);
-
--- Test tuple returning functions
-SELECT * FROM test_table_record_as('dict', null, null, false);
-SELECT * FROM test_table_record_as('dict', 'one', null, false);
-SELECT * FROM test_table_record_as('dict', null, 2, false);
-SELECT * FROM test_table_record_as('dict', 'three', 3, false);
-SELECT * FROM test_table_record_as('dict', null, null, true);
-
-SELECT * FROM test_table_record_as('tuple', null, null, false);
-SELECT * FROM test_table_record_as('tuple', 'one', null, false);
-SELECT * FROM test_table_record_as('tuple', null, 2, false);
-SELECT * FROM test_table_record_as('tuple', 'three', 3, false);
-SELECT * FROM test_table_record_as('tuple', null, null, true);
-
-SELECT * FROM test_table_record_as('list', null, null, false);
-SELECT * FROM test_table_record_as('list', 'one', null, false);
-SELECT * FROM test_table_record_as('list', null, 2, false);
-SELECT * FROM test_table_record_as('list', 'three', 3, false);
-SELECT * FROM test_table_record_as('list', null, null, true);
-
-SELECT * FROM test_table_record_as('obj', null, null, false);
-SELECT * FROM test_table_record_as('obj', 'one', null, false);
-SELECT * FROM test_table_record_as('obj', null, 2, false);
-SELECT * FROM test_table_record_as('obj', 'three', 3, false);
-SELECT * FROM test_table_record_as('obj', null, null, true);
-
-SELECT * FROM test_type_record_as('dict', null, null, false);
-SELECT * FROM test_type_record_as('dict', 'one', null, false);
-SELECT * FROM test_type_record_as('dict', null, 2, false);
-SELECT * FROM test_type_record_as('dict', 'three', 3, false);
-SELECT * FROM test_type_record_as('dict', null, null, true);
-
-SELECT * FROM test_type_record_as('tuple', null, null, false);
-SELECT * FROM test_type_record_as('tuple', 'one', null, false);
-SELECT * FROM test_type_record_as('tuple', null, 2, false);
-SELECT * FROM test_type_record_as('tuple', 'three', 3, false);
-SELECT * FROM test_type_record_as('tuple', null, null, true);
-
-SELECT * FROM test_type_record_as('list', null, null, false);
-SELECT * FROM test_type_record_as('list', 'one', null, false);
-SELECT * FROM test_type_record_as('list', null, 2, false);
-SELECT * FROM test_type_record_as('list', 'three', 3, false);
-SELECT * FROM test_type_record_as('list', null, null, true);
-
-SELECT * FROM test_type_record_as('obj', null, null, false);
-SELECT * FROM test_type_record_as('obj', 'one', null, false);
-SELECT * FROM test_type_record_as('obj', null, 2, false);
-SELECT * FROM test_type_record_as('obj', 'three', 3, false);
-SELECT * FROM test_type_record_as('obj', null, null, true);
-
-SELECT * FROM test_in_out_params('test_in');
--- this doesn't work yet :-(
-SELECT * FROM test_in_out_params_multi('test_in');
-SELECT * FROM test_inout_params('test_in');
+select argument_test_one(users, fname, lname) from users where lname = 'doe' order by 1;
diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql
new file mode 100644
index 0000000000..b042ae926e
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_trigger.sql
@@ -0,0 +1,95 @@
+-- these triggers are dedicated to HPHC of RI who
+-- decided that my kid's name was william not willem, and
+-- vigorously resisted all efforts at correction.  they have
+-- since gone bankrupt...
+
+CREATE FUNCTION users_insert() returns trigger
+	AS
+'if TD["new"]["fname"] == None or TD["new"]["lname"] == None:
+	return "SKIP"
+if TD["new"]["username"] == None:
+	TD["new"]["username"] = TD["new"]["fname"][:1] + "_" + TD["new"]["lname"]
+	rv = "MODIFY"
+else:
+	rv = None
+if TD["new"]["fname"] == "william":
+	TD["new"]["fname"] = TD["args"][0]
+	rv = "MODIFY"
+return rv'
+	LANGUAGE plpythonu;
+
+
+CREATE FUNCTION users_update() returns trigger
+	AS
+'if TD["event"] == "UPDATE":
+	if TD["old"]["fname"] != TD["new"]["fname"] and TD["old"]["fname"] == TD["args"][0]:
+		return "SKIP"
+return None'
+	LANGUAGE plpythonu;
+
+
+CREATE FUNCTION users_delete() RETURNS trigger
+	AS
+'if TD["old"]["fname"] == TD["args"][0]:
+	return "SKIP"
+return None'
+	LANGUAGE plpythonu;
+
+
+CREATE TRIGGER users_insert_trig BEFORE INSERT ON users FOR EACH ROW
+	EXECUTE PROCEDURE users_insert ('willem');
+
+CREATE TRIGGER users_update_trig BEFORE UPDATE ON users FOR EACH ROW
+	EXECUTE PROCEDURE users_update ('willem');
+
+CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
+	EXECUTE PROCEDURE users_delete ('willem');
+
+
+-- quick peek at the table
+--
+SELECT * FROM users;
+
+-- should fail
+--
+UPDATE users SET fname = 'william' WHERE fname = 'willem';
+
+-- should modify william to willem and create username
+--
+INSERT INTO users (fname, lname) VALUES ('william', 'smith');
+INSERT INTO users (fname, lname, username) VALUES ('charles', 'darwin', 'beagle');
+
+SELECT * FROM users;
+
+
+-- dump trigger data
+
+CREATE TABLE trigger_test
+	(i int, v text );
+
+CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
+
+if TD.has_key('relid'):
+	TD['relid'] = "bogus:12345"
+
+skeys = TD.keys()
+skeys.sort()
+for key in skeys:
+	val = TD[key]
+	plpy.notice("TD[" + key + "] => " + str(val))
+
+return None  
+
+$$;
+
+CREATE TRIGGER show_trigger_data_trig 
+BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+
+insert into trigger_test values(1,'insert');
+update trigger_test set v = 'update' where i = 1;
+delete from trigger_test;
+      
+DROP TRIGGER show_trigger_data_trig on trigger_test;
+      
+DROP FUNCTION trigger_data();
diff --git a/src/pl/plpython/sql/plpython_unicode.sql b/src/pl/plpython/sql/plpython_unicode.sql
new file mode 100644
index 0000000000..d2c8ee1bd8
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_unicode.sql
@@ -0,0 +1,37 @@
+--
+-- Unicode handling
+--
+
+CREATE TABLE unicode_test (
+	testvalue  text NOT NULL
+);
+
+CREATE FUNCTION unicode_return_error() RETURNS text AS E'
+return u"\\x80"
+' LANGUAGE plpythonu;
+
+CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS E'
+TD["new"]["testvalue"] = u"\\x80"
+return "MODIFY"
+' LANGUAGE plpythonu;
+
+CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
+  FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
+
+CREATE FUNCTION unicode_plan_error1() RETURNS text AS E'
+plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
+rv = plpy.execute(plan, [u"\\x80"], 1)
+return rv[0]["testvalue"]
+' LANGUAGE plpythonu;
+
+CREATE FUNCTION unicode_plan_error2() RETURNS text AS E'
+plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
+rv = plpy.execute(plan, u"\\x80", 1)
+return rv[0]["testvalue1"]
+' LANGUAGE plpythonu;
+
+
+SELECT unicode_return_error();
+INSERT INTO unicode_test (testvalue) VALUES ('test');
+SELECT unicode_plan_error1();
+SELECT unicode_plan_error2();
diff --git a/src/pl/plpython/sql/plpython_void.sql b/src/pl/plpython/sql/plpython_void.sql
new file mode 100644
index 0000000000..77d7f59e4c
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_void.sql
@@ -0,0 +1,22 @@
+--
+-- Tests for functions that return void
+--
+
+CREATE FUNCTION test_void_func1() RETURNS void AS $$
+x = 10
+$$ LANGUAGE plpythonu;
+
+-- illegal: can't return non-None value in void-returning func
+CREATE FUNCTION test_void_func2() RETURNS void AS $$
+return 10
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION test_return_none() RETURNS int AS $$
+None
+$$ LANGUAGE plpythonu;
+
+
+-- Tests for functions returning void
+SELECT test_void_func1(), test_void_func1() IS NULL AS "is null";
+SELECT test_void_func2(); -- should fail
+SELECT test_return_none(), test_return_none() IS NULL AS "is null";