From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 28 Mar 2018 15:01:40 +0000 (-0400)
Subject: Fix jsonb_plpython tests on older Python versions
X-Git-Tag: REL_11_BETA1~458
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e81fc9b9dbf9d744dcc9fb210e4353a350be1e22;p=thirdparty%2Fpostgresql.git

Fix jsonb_plpython tests on older Python versions

Rewrite one test to avoid a case where some Python versions have output
format differences (Decimal('1') vs Decimal("1")).
---

diff --git a/contrib/jsonb_plpython/expected/jsonb_plpython.out b/contrib/jsonb_plpython/expected/jsonb_plpython.out
index bed24010e19..22a7e53b69f 100644
--- a/contrib/jsonb_plpython/expected/jsonb_plpython.out
+++ b/contrib/jsonb_plpython/expected/jsonb_plpython.out
@@ -6,11 +6,10 @@ LANGUAGE plpythonu
 TRANSFORM FOR TYPE jsonb
 AS $$
 assert isinstance(val, dict)
-plpy.info(sorted(val.items()))
+assert(val == {'a': 1, 'c': 'NULL'})
 return len(val)
 $$;
 SELECT test1('{"a": 1, "c": "NULL"}'::jsonb);
-INFO:  [('a', Decimal('1')), ('c', 'NULL')]
  test1 
 -------
      2
diff --git a/contrib/jsonb_plpython/sql/jsonb_plpython.sql b/contrib/jsonb_plpython/sql/jsonb_plpython.sql
index eaf2f625a6f..b4b0820afe6 100644
--- a/contrib/jsonb_plpython/sql/jsonb_plpython.sql
+++ b/contrib/jsonb_plpython/sql/jsonb_plpython.sql
@@ -6,7 +6,7 @@ LANGUAGE plpythonu
 TRANSFORM FOR TYPE jsonb
 AS $$
 assert isinstance(val, dict)
-plpy.info(sorted(val.items()))
+assert(val == {'a': 1, 'c': 'NULL'})
 return len(val)
 $$;