-
Notifications
You must be signed in to change notification settings - Fork 171
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support for time, datetime, json, real, double types #202
Closed
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a810cd3
Support for time, datetime, json, real, double types as well as Infin…
lpoulain 838cc2e
Fix failing integration tests
lpoulain 403f5b7
Fixed dbapi integration tests
lpoulain 222d388
Slight optimization for array/map/row types
lpoulain 11d3d12
Merge branch 'master' into master
lpoulain 2d37790
Code change to fix code check errors
lpoulain c438a77
Code change to fix code check errors
lpoulain 379a292
Fix last failing tests
lpoulain 0807149
Fix last failing tests
lpoulain 6ef363d
Fix wrong type declared in functions
lpoulain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,316 @@ | ||
| import math | ||
| import pytest | ||
| from decimal import Decimal | ||
| import datetime | ||
| from datetime import timezone, timedelta | ||
| import trino | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def trino_connection(run_trino): | ||
| _, host, port = run_trino | ||
|
|
||
| yield trino.dbapi.Connection( | ||
| host=host, port=port, user="test", source="test", max_attempts=1 | ||
| ) | ||
|
|
||
|
|
||
| def test_int_types(trino_connection): | ||
| cur = trino_connection.cursor(experimental_python_types=True) | ||
| cur.execute(""" | ||
| SELECT false AS col_bool | ||
| , cast(null AS BOOLEAN) AS col_bool_null | ||
| , cast(127 AS TINYINT) AS col_tinyint | ||
| , cast(-128 AS TINYINT) AS col_tinyint_min | ||
| , cast(null AS TINYINT) AS col_tinyint_null | ||
| , cast(32767 AS SMALLINT) AS col_smallint | ||
| , cast(-32768 AS SMALLINT) AS col_smallint_min | ||
| , cast(null AS SMALLINT) AS col_smallint_null | ||
| , cast(2147483647 AS INTEGER) AS col_integer | ||
| , cast(-2147483648 AS INTEGER) AS col_integer_min | ||
| , cast(null AS INTEGER) AS col_integer_null | ||
| , cast(9223372036854775807 AS BIGINT) AS col_bigint | ||
| , cast(-9223372036854775808 AS BIGINT) AS col_bigint_min | ||
| , cast(null AS BIGINT) AS col_bigint_null | ||
| """) | ||
| result = cur.fetchall() | ||
| compare_results(result[0], [ | ||
| False, | ||
| None, | ||
| 127, | ||
| -128, | ||
| None, | ||
| 32767, | ||
| -32768, | ||
| None, | ||
| 2147483647, | ||
| -2147483648, | ||
| None, | ||
| 9223372036854775807, | ||
| -9223372036854775808, | ||
| None | ||
| ]) | ||
|
|
||
|
|
||
| def test_float_types(trino_connection): | ||
| cur = trino_connection.cursor(experimental_python_types=True) | ||
| cur.execute(""" | ||
| SELECT cast(3.4028235E38 AS REAL) AS col_real | ||
| , cast(1.4E-45 AS REAL) as col_real_min | ||
| , cast('Infinity' AS REAL) AS col_real_inf | ||
| , cast('-Infinity' AS REAL) AS col_real_ninf | ||
| , cast('NaN' AS REAL) AS col_real_nan | ||
| , cast(null AS REAL) AS col_real_null | ||
| , cast(1.7976931348623157E308 AS DOUBLE) AS col_double | ||
| , cast(4.9E-324 AS DOUBLE) as col_double_min | ||
| , cast('Infinity' AS DOUBLE) AS col_double_inf | ||
| , cast('-Infinity' AS DOUBLE) AS col_double_ninf | ||
| , cast('NaN' AS DOUBLE) AS col_double_nan | ||
| , cast(null AS DOUBLE) AS col_double_null | ||
| , DECIMAL '10.3' AS col_decimal | ||
| , cast(null AS DECIMAL) AS col_decimal_null | ||
| , cast('0.123456789123456789' AS DECIMAL(18,18)) col_decimal18 | ||
| , cast(null AS DECIMAL(18,18)) AS col_decimal18_null | ||
| , cast('10.3' AS DECIMAL(38,0)) col_decimal38 | ||
| , cast(null AS DECIMAL(38,0)) AS col_decimal38_null | ||
| """) | ||
|
|
||
| result = cur.fetchall() | ||
| compare_results(result[0], [ | ||
| 3.4028235e+38, | ||
| 1.4e-45, | ||
| math.inf, | ||
| -math.inf, | ||
| math.nan, | ||
| None, | ||
| 1.7976931348623157e+308, | ||
| 5e-324, | ||
| math.inf, | ||
| -math.inf, | ||
| math.nan, | ||
| None, | ||
| Decimal('10.3'), | ||
| None, | ||
| Decimal('0.123456789123456789'), | ||
| None, | ||
| 10.0, | ||
| None | ||
| ]) | ||
|
|
||
|
|
||
| def test_string_types(trino_connection): | ||
| cur = trino_connection.cursor(experimental_python_types=True) | ||
| cur.execute(""" | ||
| SELECT 'aaa' AS col_varchar | ||
| , U&'Hello winter \2603 !' AS col_varchar_uni | ||
| , cast(null AS VARCHAR) AS col_varchar_null | ||
| , cast('bbb' AS VARCHAR(1)) AS col_varchar1 | ||
| , cast(null AS VARCHAR(1)) AS col_varchar1_null | ||
| , cast('ccc' AS CHAR) AS col_char | ||
| , cast(null AS CHAR) AS col_char_null | ||
| , cast('ddd' AS CHAR(1)) AS col_char1 | ||
| , cast(null AS CHAR(1)) AS col_char1_null | ||
| , X'65683F' AS col_varbinary | ||
| , cast(null AS VARBINARY) AS col_varbinary_null | ||
| , cast('{}' AS JSON) AS col_json | ||
| , cast('null' AS JSON) AS col_json_null2 | ||
| , cast(null AS JSON) AS col_json_null | ||
| """) | ||
|
|
||
| result = cur.fetchall() | ||
| compare_results(result[0], [ | ||
| 'aaa', | ||
| 'Hello winter °3 !', | ||
| None, | ||
| 'b', | ||
| None, | ||
| 'c', | ||
| None, | ||
| 'd', | ||
| None, | ||
| 'ZWg/', | ||
| None, | ||
| {}, | ||
| None, | ||
| None | ||
| ]) | ||
|
|
||
|
|
||
| def test_datetime_types(trino_connection): | ||
| cur = trino_connection.cursor(experimental_python_types=True) | ||
| cur.execute(""" | ||
| SELECT DATE '2001-08-22' AS col_date | ||
| , cast(null AS DATE) AS col_date_null | ||
| , TIME '01:23:45.123' AS col_time | ||
| , cast(null AS TIME) AS col_time_null | ||
| , cast('01:23:45' AS TIME(0)) AS col_time0 | ||
| , cast(null AS TIME(0)) AS col_time0_null | ||
| , cast('01:23:45.123' AS TIME(3)) AS col_time3 | ||
| , cast(null AS TIME(3)) AS col_time3_null | ||
| , cast('01:23:45.123456' AS TIME(6)) AS col_time6 | ||
| , cast(null AS TIME(6)) AS col_time6_null | ||
| , cast('01:23:45.123456789' AS TIME(9)) AS col_time9 | ||
| , cast(null AS TIME(9)) AS col_time9_null | ||
| , cast('01:23:45.123456789123' AS TIME(12)) AS col_time12 | ||
| , cast(null AS TIME(12)) AS col_time12_null | ||
| , TIME '01:23:45.123 -08:00' AS col_timetz | ||
| , cast(null AS TIME WITH TIME ZONE) AS col_timetz_null | ||
| , cast('01:23:45 -08:00' AS TIME(0) WITH TIME ZONE) AS col_timetz0 | ||
| , cast(null AS TIME(0) WITH TIME ZONE) AS col_timetz0_null | ||
| , cast('01:23:45.123 -08:00' AS TIME(3) WITH TIME ZONE) AS col_timetz3 | ||
| , cast(null AS TIME(3) WITH TIME ZONE) AS col_timetz3_null | ||
| , cast('01:23:45.123456 -08:00' AS TIME(6) WITH TIME ZONE) AS col_timetz6 | ||
| , cast(null AS TIME(6) WITH TIME ZONE) AS col_timetz6_null | ||
| , cast('01:23:45.123456789 -08:00' AS TIME(9) WITH TIME ZONE) AS col_timetz9 | ||
| , cast(null AS TIME(9) WITH TIME ZONE) AS col_timetz9_null | ||
| , cast('01:23:45.123456789123 -08:00' AS TIME(12) WITH TIME ZONE) AS col_timetz12 | ||
| , cast(null AS TIME(12) WITH TIME ZONE) AS col_timetz12_null | ||
| , TIMESTAMP '2001-08-22 01:23:45.123' AS col_ts | ||
| , cast(null AS TIMESTAMP) AS col_ts_null | ||
| , cast('2001-08-22 01:23:45' AS TIMESTAMP(0)) AS col_ts0 | ||
| , cast(null AS TIMESTAMP(0)) AS col_ts0_null | ||
| , cast('2001-08-22 01:23:45.123' AS TIMESTAMP(3)) AS col_ts3 | ||
| , cast(null AS TIMESTAMP(3)) AS col_ts3_null | ||
| , cast('2001-08-22 01:23:45.123456' AS TIMESTAMP(6)) AS col_ts6 | ||
| , cast(null AS TIMESTAMP(6)) AS col_ts6_null | ||
| , cast('2001-08-22 01:23:45.123456789' AS TIMESTAMP(9)) AS col_ts9 | ||
| , cast(null AS TIMESTAMP(9)) AS col_ts9_null | ||
| , cast('2001-08-22 01:23:45.123456789123' AS TIMESTAMP(12)) AS col_ts12 | ||
| , cast(null AS TIMESTAMP(12)) AS col_ts12_null | ||
| , TIMESTAMP '2001-08-22 01:23:45.123 -08:00' AS col_tstz | ||
| , cast(null AS TIMESTAMP WITH TIME ZONE) AS col_tstz_null | ||
| , cast('2001-08-22 01:23:45 -08:00' AS TIMESTAMP(0) WITH TIME ZONE) AS col_tstz0 | ||
| , cast(null AS TIMESTAMP(0) WITH TIME ZONE) AS col_tstz0_null | ||
| , cast('2001-08-22 01:23:45.123 -08:00' AS TIMESTAMP(3) WITH TIME ZONE) AS col_tstz3 | ||
| , cast(null AS TIMESTAMP(3) WITH TIME ZONE) AS col_tstz3_null | ||
| , cast('2001-08-22 01:23:45.123456 -08:00' AS TIMESTAMP(6) WITH TIME ZONE) AS col_tstz6 | ||
| , cast(null AS TIMESTAMP(6) WITH TIME ZONE) AS col_tstz6_null | ||
| , cast('2001-08-22 01:23:45.123456789 -08:00' AS TIMESTAMP(9) WITH TIME ZONE) AS col_tstz9 | ||
| , cast(null AS TIMESTAMP(9) WITH TIME ZONE) AS col_tstz9_null | ||
| , cast('2001-08-22 01:23:45.123456789123 -08:00' AS TIMESTAMP(12) WITH TIME ZONE) AS col_tstz12 | ||
| , cast(null AS TIMESTAMP(12) WITH TIME ZONE) AS col_tstz12_null | ||
| """) | ||
|
|
||
| result = cur.fetchall() | ||
| the_tz = datetime.timezone(datetime.timedelta(days=-1, seconds=57600)) | ||
|
|
||
| compare_results(result[0], [ | ||
| datetime.date(2001, 8, 22), | ||
| None, | ||
| datetime.time(1, 23, 45, 123000), | ||
| None, | ||
| datetime.time(1, 23, 45), | ||
| None, | ||
| datetime.time(1, 23, 45, 123000), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456), | ||
| None, | ||
| datetime.time(1, 23, 45, 123000).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.time(1, 23, 45).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.time(1, 23, 45, 123000).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.time(1, 23, 45, 123456).replace(tzinfo=timezone(-timedelta(hours=8))), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123000), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123000), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123456), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 189000), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 189123), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123000, tzinfo=the_tz), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, tzinfo=the_tz), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123000, the_tz), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 123456, the_tz), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 189000, the_tz), | ||
| None, | ||
| datetime.datetime(2001, 8, 22, 1, 23, 45, 189123, the_tz), | ||
| None | ||
| ]) | ||
|
|
||
|
|
||
| def test_misc_types(trino_connection): | ||
| cur = trino_connection.cursor(experimental_python_types=True) | ||
| cur.execute(""" | ||
| SELECT INTERVAL '3' MONTH AS col_int_year | ||
| , cast(null AS INTERVAL YEAR TO MONTH) AS col_int_year_null | ||
| , INTERVAL '2' DAY AS col_int_day | ||
| , cast(null AS INTERVAL DAY TO SECOND) AS col_int_day_null | ||
| , ARRAY['a', 'b', null] AS col_array | ||
| , cast(null AS ARRAY(VARCHAR)) AS col_array_null | ||
| , MAP(ARRAY['a', 'b'], ARRAY[1, null]) AS col_map | ||
| , cast(null AS MAP(VARCHAR, INTEGER)) AS col_map_null | ||
| , cast(ROW(1, 2e0) AS ROW(x BIGINT, y DOUBLE)) AS col_row | ||
| , cast(null AS ROW(x BIGINT, y DOUBLE)) AS col_row_null | ||
| , IPADDRESS '2001:db8::1' AS col_ipaddr | ||
| , cast(null AS IPADDRESS) AS col_ipaddr_null | ||
| , UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59' AS col_uuid | ||
| , cast(null AS UUID) AS col_uuid_null | ||
| , approx_set(1) AS col_hll | ||
| , cast(null AS HyperLogLog) AS col_hll_null | ||
| , cast(approx_set(1) AS P4HyperLogLog) AS col_p4hll | ||
| , cast(null AS P4HyperLogLog) AS col_p4hll_null | ||
| , make_set_digest(1) AS col_setdigest | ||
| , cast(null AS SetDigest) AS col_setdigest_null | ||
| , cast(null AS QDigest(BIGINT)) AS col_qdigest_null | ||
| , tdigest_agg(1) AS col_tdigest | ||
| , cast(null AS TDigest) AS col_tdigest_null | ||
| """) | ||
|
|
||
| result = cur.fetchall() | ||
| compare_results(result[0], [ | ||
| '0-3', | ||
| None, | ||
| '2 00:00:00.000', | ||
| None, | ||
| ['a', 'b', None], | ||
| None, | ||
| {'a': 1, 'b': None}, | ||
| None, | ||
| (1, 2.0), | ||
| None, | ||
| '2001:db8::1', | ||
| None, | ||
| '12151fd2-7586-11e9-8f9e-2a86e4085a59', | ||
| None, | ||
| 'AgwBAIADRAA=', | ||
| None, | ||
| 'AwwAAAAg' + 'A' * 2730 + '==', | ||
| None, | ||
| 'AQgAAAACCwEAgANEAAAgAAABAAAASsQF+7cDRAABAA==', | ||
| None, | ||
| None, | ||
| 'AAAAAAAAAPA/AAAAAAAA8D8AAAAAAABZQAAAAAAAAPA/AQAAAAAAAAAAAPA/AAAAAAAA8D8=', | ||
| None | ||
| ]) | ||
|
|
||
|
|
||
| def compare_results(actual, expected): | ||
| assert len(actual) == len(expected) | ||
|
|
||
| for idx, actual_val in enumerate(actual): | ||
| expected_val = expected[idx] | ||
| if type(actual_val) == float and math.isnan(actual_val) \ | ||
| and type(expected_val) == float and math.isnan(expected_val): | ||
| continue | ||
|
|
||
| assert actual_val == expected_val |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that only milliseconds are currently supported. If you would change the test case to more precise values over ms, eg.
params = datetime(2020, 1, 1, 16, 43, 22, 320258), you would see that 258 part is lost, because of #42.IMHO providing a value with a precision that is not actually supported right now seems not so useful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually the whole 6 digits are preserved now.