fix conflicts

apache · Mar 31, 2022 · 40c48e8 · 40c48e8
1 parent 62fda63
commit 40c48e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -689,7 +689,7 @@ def sql_url(self) -> str:
     def external_metadata(self) -> List[Dict[str, str]]:
         # todo(yongjie): create a pysical table column type in seprated PR
         if self.sql:
-            return get_virtual_table_metadata(dataset=self)
+            return get_virtual_table_metadata(dataset=self)  # type: ignore
         return get_physical_table_metadata(
             database=self.database,
             table_name=self.table_name,

diff --git a/superset/connectors/sqla/utils.py b/superset/connectors/sqla/utils.py
@@ -34,6 +34,7 @@
 from superset.models.core import Database
 from superset.result_set import SupersetResultSet
 from superset.sql_parse import has_table_query, ParsedQuery, Table
+from superset.superset_typing import ResultSetColumnType
 from superset.tables.models import Table as NewTable
 
 if TYPE_CHECKING:
@@ -91,7 +92,7 @@ def get_physical_table_metadata(
     return cols
 
 
-def get_virtual_table_metadata(dataset: "SqlaTable") -> List[Dict[str, str]]:
+def get_virtual_table_metadata(dataset: "SqlaTable") -> List[ResultSetColumnType]:
     """Use SQLparser to get virtual dataset metadata"""
     if not dataset.sql:
         raise SupersetGenericDBErrorException(

diff --git a/tests/integration_tests/db_engine_specs/presto_tests.py b/tests/integration_tests/db_engine_specs/presto_tests.py
@@ -842,7 +842,10 @@ def test_select_star_presto_expand_data(
             True,
             True,
             True,
-            [{"name": "val1"}, {"name": "val2<?!@#$312,/'][p098"},],
+            [
+                {"name": "val1"},
+                {"name": "val2<?!@#$312,/'][p098"},
+            ],
         )
 
     def test_estimate_statement_cost(self):