mirror of
https://github.com/apache/superset.git
synced 2026-04-19 16:14:52 +00:00
fix: add format for timestamp in crdb to correctly use times values (#24711)
Co-authored-by: John Bodley <4567245+john-bodley@users.noreply.github.com>
This commit is contained in:
@@ -14,10 +14,25 @@
|
|||||||
# KIND, either express or implied. See the License for the
|
# KIND, either express or implied. See the License for the
|
||||||
# specific language governing permissions and limitations
|
# specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Any, Optional
|
||||||
|
|
||||||
|
from sqlalchemy import types
|
||||||
|
|
||||||
from superset.db_engine_specs.postgres import PostgresEngineSpec
|
from superset.db_engine_specs.postgres import PostgresEngineSpec
|
||||||
|
|
||||||
|
|
||||||
class CockroachDbEngineSpec(PostgresEngineSpec):
|
class CockroachDbEngineSpec(PostgresEngineSpec):
|
||||||
engine = "cockroachdb"
|
engine = "cockroachdb"
|
||||||
engine_name = "CockroachDB"
|
engine_name = "CockroachDB"
|
||||||
default_driver = ""
|
|
||||||
|
@classmethod
|
||||||
|
def convert_dttm(
|
||||||
|
cls, target_type: str, dttm: datetime, db_extra: Optional[dict[str, Any]] = None
|
||||||
|
) -> Optional[str]:
|
||||||
|
sqla_type = cls.get_sqla_column_type(target_type)
|
||||||
|
if isinstance(sqla_type, types.Date):
|
||||||
|
return f"'{dttm.date().isoformat()}'"
|
||||||
|
if isinstance(sqla_type, (types.String, types.DateTime)):
|
||||||
|
return f"""'{dttm.isoformat(sep=" ", timespec="seconds")}'"""
|
||||||
|
return None
|
||||||
|
|||||||
40
tests/unit_tests/db_engine_specs/test_crdb.py
Normal file
40
tests/unit_tests/db_engine_specs/test_crdb.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
# Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
# or more contributor license agreements. See the NOTICE file
|
||||||
|
# distributed with this work for additional information
|
||||||
|
# regarding copyright ownership. The ASF licenses this file
|
||||||
|
# to you under the Apache License, Version 2.0 (the
|
||||||
|
# "License"); you may not use this file except in compliance
|
||||||
|
# with the License. You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing,
|
||||||
|
# software distributed under the License is distributed on an
|
||||||
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
# KIND, either express or implied. See the License for the
|
||||||
|
# specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
# pylint: disable=unused-argument, import-outside-toplevel, protected-access
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from tests.unit_tests.db_engine_specs.utils import assert_convert_dttm
|
||||||
|
from tests.unit_tests.fixtures.common import dttm
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"target_type,expected_result",
|
||||||
|
[
|
||||||
|
("Date", "'2019-01-02'"),
|
||||||
|
("TimeStamp", "'2019-01-02 03:04:05'"),
|
||||||
|
("UnknownType", None),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_convert_dttm(
|
||||||
|
target_type: str, expected_result: Optional[str], dttm: datetime
|
||||||
|
) -> None:
|
||||||
|
from superset.db_engine_specs.cockroachdb import CockroachDbEngineSpec as spec
|
||||||
|
|
||||||
|
assert_convert_dttm(spec, target_type, expected_result, dttm)
|
||||||
Reference in New Issue
Block a user