fix: is_temporal should overwrite is_dttm (apache#14894)

* fix: is_temporal should overwrite is_dttm * move up
CybercentreCanada · Dec 17, 2021 · 213197b · 213197b
1 parent 1c6228d
commit 213197b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -231,6 +231,8 @@ def db_engine_spec(self) -> Type[BaseEngineSpec]:
 
     @property
     def type_generic(self) -> Optional[utils.GenericDataType]:
+        if self.is_dttm:
+            return GenericDataType.TEMPORAL
         column_spec = self.db_engine_spec.get_column_spec(self.type)
         return column_spec.generic_type if column_spec else None
 

diff --git a/tests/sqla_models_tests.py b/tests/sqla_models_tests.py
@@ -102,6 +102,10 @@ def test_db_column_types(self):
             self.assertEqual(col.is_numeric, db_col_type == GenericDataType.NUMERIC)
             self.assertEqual(col.is_string, db_col_type == GenericDataType.STRING)
 
+        for str_type, db_col_type in test_cases.items():
+            col = TableColumn(column_name="foo", type=str_type, table=tbl, is_dttm=True)
+            self.assertTrue(col.is_temporal)
+
     @patch("superset.jinja_context.g")
     def test_extra_cache_keys(self, flask_g):
         flask_g.user.username = "abc"