QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sqla): replace custom dttm type with literal_column (#19917)

Browse Source 
(cherry picked from commit 99f1f9ec61)
This commit is contained in:
Ville Brofeldt
2022-05-03 07:19:36 +03:00
committed by Michael S. Molina
parent 2bd89d1705
commit 9ca53b8905
14 changed files with 63 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit_tests/db_engine_specs/test_athena.py
View File

@@ -35,13 +35,11 @@ def test_convert_dttm(app_context: AppContext, dttm: datetime) -> None:
from superset.db_engine_specs.athena import AthenaEngineSpec
assert (
AthenaEngineSpec.convert_dttm("DATE", dttm) == "from_iso8601_date('2019-01-02')"
)
assert AthenaEngineSpec.convert_dttm("DATE", dttm) == "DATE '2019-01-02'"
assert (
AthenaEngineSpec.convert_dttm("TIMESTAMP", dttm)
== "from_iso8601_timestamp('2019-01-02T03:04:05.678900')"
== "TIMESTAMP '2019-01-02T03:04:05.678900'"
)
@@ -80,8 +78,7 @@ def test_get_text_clause_with_colon(app_context: AppContext) -> None:
from superset.db_engine_specs.athena import AthenaEngineSpec
query = (
"SELECT foo FROM tbl WHERE "
"abc >= from_iso8601_timestamp('2021-11-26T00\:00\:00.000000')"
"SELECT foo FROM tbl WHERE " "abc >= TIMESTAMP '2021-11-26T00\:00\:00.000000'"
)
text_clause = AthenaEngineSpec.get_text_clause(query)
assert text_clause.text == query

8
tests/unit_tests/db_engine_specs/test_presto.py
View File

@@ -26,21 +26,21 @@ from flask.ctx import AppContext
"target_type,dttm,result",
[
("VARCHAR", datetime(2022, 1, 1), None),
("DATE", datetime(2022, 1, 1), "from_iso8601_date('2022-01-01')"),
("DATE", datetime(2022, 1, 1), "DATE '2022-01-01'"),
(
"TIMESTAMP",
datetime(2022, 1, 1, 1, 23, 45, 600000),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000')",
"TIMESTAMP '2022-01-01T01:23:45.600000'",
),
(
"TIMESTAMP WITH TIME ZONE",
datetime(2022, 1, 1, 1, 23, 45, 600000),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000')",
"TIMESTAMP '2022-01-01T01:23:45.600000'",
),
(
"TIMESTAMP WITH TIME ZONE",
datetime(2022, 1, 1, 1, 23, 45, 600000, tzinfo=pytz.UTC),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000+00:00')",
"TIMESTAMP '2022-01-01T01:23:45.600000+00:00'",
),
],
)

8
tests/unit_tests/db_engine_specs/test_trino.py
View File

@@ -26,21 +26,21 @@ from flask.ctx import AppContext
"target_type,dttm,result",
[
("VARCHAR", datetime(2022, 1, 1), None),
("DATE", datetime(2022, 1, 1), "from_iso8601_date('2022-01-01')"),
("DATE", datetime(2022, 1, 1), "DATE '2022-01-01'"),
(
"TIMESTAMP",
datetime(2022, 1, 1, 1, 23, 45, 600000),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000')",
"TIMESTAMP '2022-01-01T01:23:45.600000'",
),
(
"TIMESTAMP WITH TIME ZONE",
datetime(2022, 1, 1, 1, 23, 45, 600000),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000')",
"TIMESTAMP '2022-01-01T01:23:45.600000'",
),
(
"TIMESTAMP WITH TIME ZONE",
datetime(2022, 1, 1, 1, 23, 45, 600000, tzinfo=pytz.UTC),
"from_iso8601_timestamp('2022-01-01T01:23:45.600000+00:00')",
"TIMESTAMP '2022-01-01T01:23:45.600000+00:00'",
),
],
)