From 45d1f1e024f99152fd0d06c62d0650f9ada33d5a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 8 Sep 2012 17:39:02 -0400 Subject: [PATCH] Adjust PL/Python regression tests some more for Python 3.3. Commit 2cfb1c6f77734db81b6e74bcae630f93b94f69be fixed some issues caused by Python 3.3 choosing to iterate through dict entries in a different order than before. But here's another one: the test cases adjusted here made two bad entries in a dict and expected the one complained of would always be the same. Possibly this should be back-patched further than 9.2, but there seems little point unless the earlier fix is too. --- src/pl/plpython/expected/plpython_trigger.out | 4 ++-- src/pl/plpython/sql/plpython_trigger.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out index 4c46b2b8f2..25060b09b7 100644 --- a/src/pl/plpython/expected/plpython_trigger.out +++ b/src/pl/plpython/expected/plpython_trigger.out @@ -476,7 +476,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test; -- TD keys not corresponding to row columns CREATE FUNCTION stupid7() RETURNS trigger AS $$ - TD["new"] = {'a': 'foo', 'b': 'bar'} + TD["new"] = {'v': 'foo', 'a': 'bar'} return "MODIFY"; $$ LANGUAGE plpythonu; CREATE TRIGGER stupid_trigger7 @@ -490,7 +490,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test; -- Unicode variant CREATE FUNCTION stupid7u() RETURNS trigger AS $$ - TD["new"] = {u'a': 'foo', u'b': 'bar'} + TD["new"] = {u'v': 'foo', u'a': 'bar'} return "MODIFY" $$ LANGUAGE plpythonu; CREATE TRIGGER stupid_trigger7 diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql index 2a4859f2aa..9727f44f8b 100644 --- a/src/pl/plpython/sql/plpython_trigger.sql +++ b/src/pl/plpython/sql/plpython_trigger.sql @@ -253,7 +253,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test; CREATE FUNCTION stupid7() RETURNS trigger AS $$ - TD["new"] = {'a': 'foo', 'b': 'bar'} + TD["new"] = {'v': 'foo', 'a': 'bar'} return "MODIFY"; $$ LANGUAGE plpythonu; @@ -270,7 +270,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test; CREATE FUNCTION stupid7u() RETURNS trigger AS $$ - TD["new"] = {u'a': 'foo', u'b': 'bar'} + TD["new"] = {u'v': 'foo', u'a': 'bar'} return "MODIFY" $$ LANGUAGE plpythonu;