Skip to content

P
Postgres FD Implementation
Commit 8182ffde authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

PL/Python: Make regression tests pass with older Python versions 

Avoid output formatting differences by printing str() instead of repr()
of the value.
parent 5b571bb8
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
src/pl/plpython/expected/plpython_types.out
View file @ 8182ffde
...@@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8" ...@@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8"
CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
# print just the class name, not the type, to avoid differences # print just the class name, not the type, to avoid differences
# between decimal and cdecimal # between decimal and cdecimal
plpy.info(x, x.__class__.__name__) plpy.info(str(x), x.__class__.__name__)
return x return x
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
SELECT * FROM test_type_conversion_numeric(100); SELECT * FROM test_type_conversion_numeric(100);
INFO: (Decimal('100'), 'Decimal') INFO: ('100', 'Decimal')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(-100); SELECT * FROM test_type_conversion_numeric(-100);
INFO: (Decimal('-100'), 'Decimal') INFO: ('-100', 'Decimal')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(100.0); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(100.00); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(5000000000.5); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(1234567890.0987654321); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(null); SELECT * FROM test_type_conversion_numeric(null);
INFO: (None, 'NoneType') INFO: ('None', 'NoneType')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
......
src/pl/plpython/expected/plpython_types_3.out
View file @ 8182ffde
...@@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8" ...@@ -215,11 +215,11 @@ CONTEXT: PL/Python function "test_type_conversion_int8"
CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
# print just the class name, not the type, to avoid differences # print just the class name, not the type, to avoid differences
# between decimal and cdecimal # between decimal and cdecimal
plpy.info(x, x.__class__.__name__) plpy.info(str(x), x.__class__.__name__)
return x return x
$$ LANGUAGE plpython3u; $$ LANGUAGE plpython3u;
SELECT * FROM test_type_conversion_numeric(100); SELECT * FROM test_type_conversion_numeric(100);
INFO: (Decimal('100'), 'Decimal') INFO: ('100', 'Decimal')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -227,7 +227,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(-100); SELECT * FROM test_type_conversion_numeric(-100);
INFO: (Decimal('-100'), 'Decimal') INFO: ('-100', 'Decimal')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -235,7 +235,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(100.0); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -243,7 +243,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(100.00); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -251,7 +251,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(5000000000.5); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -259,7 +259,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(1234567890.0987654321); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -267,7 +267,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321); 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" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
...@@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric" ...@@ -275,7 +275,7 @@ CONTEXT: PL/Python function "test_type_conversion_numeric"
(1 row) (1 row)
SELECT * FROM test_type_conversion_numeric(null); SELECT * FROM test_type_conversion_numeric(null);
INFO: (None, 'NoneType') INFO: ('None', 'NoneType')
CONTEXT: PL/Python function "test_type_conversion_numeric" CONTEXT: PL/Python function "test_type_conversion_numeric"
test_type_conversion_numeric test_type_conversion_numeric
------------------------------ ------------------------------
......
src/pl/plpython/sql/plpython_types.sql
View file @ 8182ffde
...@@ -88,7 +88,7 @@ SELECT * FROM test_type_conversion_int8(null); ...@@ -88,7 +88,7 @@ SELECT * FROM test_type_conversion_int8(null);
CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$ CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
# print just the class name, not the type, to avoid differences # print just the class name, not the type, to avoid differences
# between decimal and cdecimal # between decimal and cdecimal
plpy.info(x, x.__class__.__name__) plpy.info(str(x), x.__class__.__name__)
return x return x
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment