PL/Python: Adjust the regression tests for Python 3.3

Similar to 2cfb1c6f77734db81b6e74bcae630f93b94f69be, the order in which
dictionary elements are printed is not reliable.  This reappeared in the
tests of the string representation of result objects.  Reduce the test
case to one result set column so that there is no question of order.

diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out
index b07a4294392fb26e1398d6a12b5c4f935aa64e45..517579471c98def2a59f63dbbdd48b05fc47e0f3 100644 (file)
--- a/src/pl/plpython/expected/plpython_spi.out
+++ b/src/pl/plpython/expected/plpython_spi.out
@@ -269,10 +269,10 @@ plan = plpy.prepare(cmd)
 result = plpy.execute(plan)
 return str(result)
 $$ LANGUAGE plpythonu;
-SELECT result_str_test($$SELECT 1 AS foo, '11'::text AS bar UNION SELECT 2, '22'$$);
-                                   result_str_test                                    
---------------------------------------------------------------------------------------
- <PLyResult status=5 nrows=2 rows=[{'foo': 1, 'bar': '11'}, {'foo': 2, 'bar': '22'}]>
+SELECT result_str_test($$SELECT 1 AS foo UNION SELECT 2$$);
+                      result_str_test                       
+------------------------------------------------------------
+ <PLyResult status=5 nrows=2 rows=[{'foo': 1}, {'foo': 2}]>
 (1 row)
 
 SELECT result_str_test($$CREATE TEMPORARY TABLE foo1 (a int, b text)$$);

diff --git a/src/pl/plpython/sql/plpython_spi.sql b/src/pl/plpython/sql/plpython_spi.sql
index 7a844738032f2ae9da1292f35e0c69ed442267ae..09f0d7f2d78bebe460d20f588f543148acc28919 100644 (file)
--- a/src/pl/plpython/sql/plpython_spi.sql
+++ b/src/pl/plpython/sql/plpython_spi.sql
@@ -176,7 +176,7 @@ result = plpy.execute(plan)
 return str(result)
 $$ LANGUAGE plpythonu;
 
-SELECT result_str_test($$SELECT 1 AS foo, '11'::text AS bar UNION SELECT 2, '22'$$);
+SELECT result_str_test($$SELECT 1 AS foo UNION SELECT 2$$);
 SELECT result_str_test($$CREATE TEMPORARY TABLE foo1 (a int, b text)$$);
 
 -- cursor objects