From 8182ffde5aa09d8378caa599d70e0d4e02ea8d7d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 6 Jul 2013 20:36:19 -0400 Subject: [PATCH] PL/Python: Make regression tests pass with older Python versions Avoid output formatting differences by printing str() instead of repr() of the value. --- src/pl/plpython/expected/plpython_types.out | 18 +++++++++--------- src/pl/plpython/expected/plpython_types_3.out | 18 +++++++++--------- src/pl/plpython/sql/plpython_types.sql | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out index edc51423e9..91106e0455 100644 --- a/src/pl/plpython/expected/plpython_types.out +++ b/src/pl/plpython/expected/plpython_types.out @@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8" CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ # print just the class name, not the type, to avoid differences # between decimal and cdecimal -plpy.info(x, x.__class__.__name__) +plpy.info(str(x), x.__class__.__name__) return x $$ LANGUAGE plpythonu; SELECT * FROM test_type_conversion_numeric(100); -INFO: (Decimal('100'), 'Decimal') +INFO: ('100', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(-100); -INFO: (Decimal('-100'), 'Decimal') +INFO: ('-100', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(100.0); -INFO: (Decimal('100.0'), 'Decimal') +INFO: ('100.0', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(100.00); -INFO: (Decimal('100.00'), 'Decimal') +INFO: ('100.00', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(5000000000.5); -INFO: (Decimal('5000000000.5'), 'Decimal') +INFO: ('5000000000.5', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(1234567890.0987654321); -INFO: (Decimal('1234567890.0987654321'), 'Decimal') +INFO: ('1234567890.0987654321', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321); -INFO: (Decimal('-1234567890.0987654321'), 'Decimal') +INFO: ('-1234567890.0987654321', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(null); -INFO: (None, 'NoneType') +INFO: ('None', 'NoneType') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ diff --git a/src/pl/plpython/expected/plpython_types_3.out b/src/pl/plpython/expected/plpython_types_3.out index 11c4c478c4..523c2ecda2 100644 --- a/src/pl/plpython/expected/plpython_types_3.out +++ b/src/pl/plpython/expected/plpython_types_3.out @@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8" CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ # print just the class name, not the type, to avoid differences # between decimal and cdecimal -plpy.info(x, x.__class__.__name__) +plpy.info(str(x), x.__class__.__name__) return x $$ LANGUAGE plpython3u; SELECT * FROM test_type_conversion_numeric(100); -INFO: (Decimal('100'), 'Decimal') +INFO: ('100', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(-100); -INFO: (Decimal('-100'), 'Decimal') +INFO: ('-100', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(100.0); -INFO: (Decimal('100.0'), 'Decimal') +INFO: ('100.0', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(100.00); -INFO: (Decimal('100.00'), 'Decimal') +INFO: ('100.00', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(5000000000.5); -INFO: (Decimal('5000000000.5'), 'Decimal') +INFO: ('5000000000.5', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(1234567890.0987654321); -INFO: (Decimal('1234567890.0987654321'), 'Decimal') +INFO: ('1234567890.0987654321', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321); -INFO: (Decimal('-1234567890.0987654321'), 'Decimal') +INFO: ('-1234567890.0987654321', 'Decimal') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ @@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" (1 row) SELECT * FROM test_type_conversion_numeric(null); -INFO: (None, 'NoneType') +INFO: ('None', 'NoneType') CONTEXT: PL/Python function "test_type_conversion_numeric" test_type_conversion_numeric ------------------------------ diff --git a/src/pl/plpython/sql/plpython_types.sql b/src/pl/plpython/sql/plpython_types.sql index 6881880729..e63d07e1f9 100644 --- a/src/pl/plpython/sql/plpython_types.sql +++ b/src/pl/plpython/sql/plpython_types.sql @@ -88,7 +88,7 @@ SELECT * FROM test_type_conversion_int8(null); CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ # print just the class name, not the type, to avoid differences # between decimal and cdecimal -plpy.info(x, x.__class__.__name__) +plpy.info(str(x), x.__class__.__name__) return x $$ LANGUAGE plpythonu; -- 2.40.0