You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2022/04/04 08:22:28 UTC
[superset] 19/24: fix: can't sync temporal flag on virtual table (#19366)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to tag 1.5.0rc1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 3ff9cdeb654959e864524f49d4ed0dd95b3780bb
Author: Yongjie Zhao <yo...@gmail.com>
AuthorDate: Fri Apr 1 16:40:50 2022 +0800
fix: can't sync temporal flag on virtual table (#19366)
(cherry picked from commit d954c3df8604dc4b6a2459a17dd39450a1d57638)
---
.../cypress/integration/sqllab/query.test.ts | 4 +-
.../src/SqlLab/components/ResultSet/index.tsx | 3 +-
superset-frontend/src/SqlLab/fixtures.ts | 38 +++----
superset-frontend/src/SqlLab/types.ts | 4 +-
superset/connectors/sqla/models.py | 3 +-
superset/connectors/sqla/utils.py | 3 +-
superset/db_engine_specs/base.py | 7 +-
superset/db_engine_specs/presto.py | 34 +++---
superset/result_set.py | 8 +-
superset/superset_typing.py | 10 ++
superset/views/core.py | 2 +-
tests/integration_tests/celery_tests.py | 4 +-
.../db_engine_specs/presto_tests.py | 114 +++++++++++++++------
tests/integration_tests/result_set_tests.py | 20 ++--
tests/integration_tests/sqllab_tests.py | 8 +-
15 files changed, 170 insertions(+), 92 deletions(-)
diff --git a/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts b/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts
index ea43c66f97..f5033313fc 100644
--- a/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts
@@ -37,8 +37,8 @@ describe('SqlLab query panel', () => {
const sampleResponse = {
status: 'success',
data: [{ '?column?': 1 }],
- columns: [{ name: '?column?', type: 'INT', is_date: false }],
- selected_columns: [{ name: '?column?', type: 'INT', is_date: false }],
+ columns: [{ name: '?column?', type: 'INT', is_dttm: false }],
+ selected_columns: [{ name: '?column?', type: 'INT', is_dttm: false }],
expanded_columns: [],
};
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index dbde25ef2b..b81b471462 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -280,7 +280,8 @@ export default class ResultSet extends React.PureComponent<
sql,
results.selected_columns.map(d => ({
column_name: d.name,
- is_dttm: d.is_date,
+ type: d.type,
+ is_dttm: d.is_dttm,
})),
datasetToOverwrite.owners.map((o: DatasetOwner) => o.id),
true,
diff --git a/superset-frontend/src/SqlLab/fixtures.ts b/superset-frontend/src/SqlLab/fixtures.ts
index 5725bcf75e..5b12ee2921 100644
--- a/superset-frontend/src/SqlLab/fixtures.ts
+++ b/superset-frontend/src/SqlLab/fixtures.ts
@@ -221,24 +221,24 @@ export const queries = [
results: {
columns: [
{
- is_date: true,
+ is_dttm: true,
name: 'ds',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'gender',
type: 'STRING',
},
],
selected_columns: [
{
- is_date: true,
+ is_dttm: true,
name: 'ds',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'gender',
type: 'STRING',
},
@@ -313,24 +313,24 @@ export const queryWithNoQueryLimit = {
results: {
columns: [
{
- is_date: true,
+ is_dttm: true,
name: 'ds',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'gender',
type: 'STRING',
},
],
selected_columns: [
{
- is_date: true,
+ is_dttm: true,
name: 'ds',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'gender',
type: 'STRING',
},
@@ -350,57 +350,57 @@ export const queryWithBadColumns = {
data: queries[0].results?.data,
selected_columns: [
{
- is_date: true,
+ is_dttm: true,
name: 'COUNT(*)',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'this_col_is_ok',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'a',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: '1',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: '123',
type: 'STRING',
},
{
- is_date: false,
+ is_dttm: false,
name: 'CASE WHEN 1=1 THEN 1 ELSE 0 END',
type: 'STRING',
},
{
- is_date: true,
+ is_dttm: true,
name: '_TIMESTAMP',
type: 'TIMESTAMP',
},
{
- is_date: true,
+ is_dttm: true,
name: '__TIME',
type: 'TIMESTAMP',
},
{
- is_date: false,
+ is_dttm: false,
name: 'my_dupe_col__2',
type: 'STRING',
},
{
- is_date: true,
+ is_dttm: true,
name: '__timestamp',
type: 'TIMESTAMP',
},
{
- is_date: true,
+ is_dttm: true,
name: '__TIMESTAMP',
type: 'TIMESTAMP',
},
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index f1e088f003..d5dfddbe2b 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -21,9 +21,11 @@ import { CtasEnum } from 'src/SqlLab/actions/sqlLab';
import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
import { ToastType } from 'src/components/MessageToasts/types';
+// same as superset.result_set.ResultSetColumnType
export type Column = {
name: string;
- is_date?: boolean;
+ type: string | null;
+ is_dttm: boolean;
};
export type QueryState =
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 31f3339541..8721f6ea81 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -716,8 +716,9 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho
return self.database.sql_url + "?table_name=" + str(self.table_name)
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
index 766b74e57c..14b9071d1d 100644
--- a/superset/connectors/sqla/utils.py
+++ b/superset/connectors/sqla/utils.py
@@ -34,6 +34,7 @@ from superset.exceptions import (
from superset.models.core import Database
from superset.result_set import SupersetResultSet
from superset.sql_parse import has_table_query, insert_rls, 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/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index 1f4cb51cb8..123376bbb8 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -62,6 +62,7 @@ from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
from superset.models.sql_lab import Query
from superset.models.sql_types.base import literal_dttm_type_factory
from superset.sql_parse import ParsedQuery, Table
+from superset.superset_typing import ResultSetColumnType
from superset.utils import core as utils
from superset.utils.core import ColumnSpec, GenericDataType
from superset.utils.hashing import md5_sha_from_str
@@ -566,8 +567,10 @@ class BaseEngineSpec: # pylint: disable=too-many-public-methods
@classmethod
def expand_data(
- cls, columns: List[Dict[Any, Any]], data: List[Dict[Any, Any]]
- ) -> Tuple[List[Dict[Any, Any]], List[Dict[Any, Any]], List[Dict[Any, Any]]]:
+ cls, columns: List[ResultSetColumnType], data: List[Dict[Any, Any]]
+ ) -> Tuple[
+ List[ResultSetColumnType], List[Dict[Any, Any]], List[ResultSetColumnType]
+ ]:
"""
Some engines support expanding nested fields. See implementation in Presto
spec for details.
diff --git a/superset/db_engine_specs/presto.py b/superset/db_engine_specs/presto.py
index 60cb9c7aca..77c3d4c2e3 100644
--- a/superset/db_engine_specs/presto.py
+++ b/superset/db_engine_specs/presto.py
@@ -53,6 +53,7 @@ from superset.models.sql_types.presto_sql_types import (
)
from superset.result_set import destringify
from superset.sql_parse import ParsedQuery
+from superset.superset_typing import ResultSetColumnType
from superset.utils import core as utils
from superset.utils.core import ColumnSpec, GenericDataType
@@ -85,24 +86,26 @@ CONNECTION_UNKNOWN_DATABASE_ERROR = re.compile(
logger = logging.getLogger(__name__)
-def get_children(column: Dict[str, str]) -> List[Dict[str, str]]:
+def get_children(column: ResultSetColumnType) -> List[ResultSetColumnType]:
"""
Get the children of a complex Presto type (row or array).
For arrays, we return a single list with the base type:
- >>> get_children(dict(name="a", type="ARRAY(BIGINT)"))
- [{"name": "a", "type": "BIGINT"}]
+ >>> get_children(dict(name="a", type="ARRAY(BIGINT)", is_dttm=False))
+ [{"name": "a", "type": "BIGINT", "is_dttm": False}]
For rows, we return a list of the columns:
- >>> get_children(dict(name="a", type="ROW(BIGINT,FOO VARCHAR)"))
- [{'name': 'a._col0', 'type': 'BIGINT'}, {'name': 'a.foo', 'type': 'VARCHAR'}]
+ >>> get_children(dict(name="a", type="ROW(BIGINT,FOO VARCHAR)", is_dttm=False))
+ [{'name': 'a._col0', 'type': 'BIGINT', 'is_dttm': False}, {'name': 'a.foo', 'type': 'VARCHAR', 'is_dttm': False}] # pylint: disable=line-too-long
:param column: dictionary representing a Presto column
:return: list of dictionaries representing children columns
"""
pattern = re.compile(r"(?P<type>\w+)\((?P<children>.*)\)")
+ if not column["type"]:
+ raise ValueError
match = pattern.match(column["type"])
if not match:
raise Exception(f"Unable to parse column type {column['type']}")
@@ -111,7 +114,7 @@ def get_children(column: Dict[str, str]) -> List[Dict[str, str]]:
type_ = group["type"].upper()
children_type = group["children"]
if type_ == "ARRAY":
- return [{"name": column["name"], "type": children_type}]
+ return [{"name": column["name"], "type": children_type, "is_dttm": False}]
if type_ == "ROW":
nameless_columns = 0
@@ -125,7 +128,12 @@ def get_children(column: Dict[str, str]) -> List[Dict[str, str]]:
name = f"_col{nameless_columns}"
type_ = parts[0]
nameless_columns += 1
- columns.append({"name": f"{column['name']}.{name.lower()}", "type": type_})
+ _column: ResultSetColumnType = {
+ "name": f"{column['name']}.{name.lower()}",
+ "type": type_,
+ "is_dttm": False,
+ }
+ columns.append(_column)
return columns
raise Exception(f"Unknown type {type_}!")
@@ -779,8 +787,10 @@ class PrestoEngineSpec(BaseEngineSpec): # pylint: disable=too-many-public-metho
@classmethod
def expand_data( # pylint: disable=too-many-locals
- cls, columns: List[Dict[Any, Any]], data: List[Dict[Any, Any]]
- ) -> Tuple[List[Dict[Any, Any]], List[Dict[Any, Any]], List[Dict[Any, Any]]]:
+ cls, columns: List[ResultSetColumnType], data: List[Dict[Any, Any]]
+ ) -> Tuple[
+ List[ResultSetColumnType], List[Dict[Any, Any]], List[ResultSetColumnType]
+ ]:
"""
We do not immediately display rows and arrays clearly in the data grid. This
method separates out nested fields and data values to help clearly display
@@ -808,7 +818,7 @@ class PrestoEngineSpec(BaseEngineSpec): # pylint: disable=too-many-public-metho
# process each column, unnesting ARRAY types and
# expanding ROW types into new columns
to_process = deque((column, 0) for column in columns)
- all_columns: List[Dict[str, Any]] = []
+ all_columns: List[ResultSetColumnType] = []
expanded_columns = []
current_array_level = None
while to_process:
@@ -828,7 +838,7 @@ class PrestoEngineSpec(BaseEngineSpec): # pylint: disable=too-many-public-metho
name = column["name"]
values: Optional[Union[str, List[Any]]]
- if column["type"].startswith("ARRAY("):
+ if column["type"] and column["type"].startswith("ARRAY("):
# keep processing array children; we append to the right so that
# multiple nested arrays are processed breadth-first
to_process.append((get_children(column)[0], level + 1))
@@ -862,7 +872,7 @@ class PrestoEngineSpec(BaseEngineSpec): # pylint: disable=too-many-public-metho
i += 1
- if column["type"].startswith("ROW("):
+ if column["type"] and column["type"].startswith("ROW("):
# expand columns; we append them to the left so they are added
# immediately after the parent
expanded = get_children(column)
diff --git a/superset/result_set.py b/superset/result_set.py
index 19035b6d23..82b0a31393 100644
--- a/superset/result_set.py
+++ b/superset/result_set.py
@@ -26,7 +26,7 @@ import pandas as pd
import pyarrow as pa
from superset.db_engine_specs import BaseEngineSpec
-from superset.superset_typing import DbapiDescription, DbapiResult
+from superset.superset_typing import DbapiDescription, DbapiResult, ResultSetColumnType
from superset.utils import core as utils
logger = logging.getLogger(__name__)
@@ -210,17 +210,17 @@ class SupersetResultSet:
return self.table.num_rows
@property
- def columns(self) -> List[Dict[str, Any]]:
+ def columns(self) -> List[ResultSetColumnType]:
if not self.table.column_names:
return []
columns = []
for col in self.table.schema:
db_type_str = self.data_type(col.name, col.type)
- column = {
+ column: ResultSetColumnType = {
"name": col.name,
"type": db_type_str,
- "is_date": self.is_temporal(db_type_str),
+ "is_dttm": self.is_temporal(db_type_str),
}
columns.append(column)
diff --git a/superset/superset_typing.py b/superset/superset_typing.py
index 253d2b6355..1af04494d0 100644
--- a/superset/superset_typing.py
+++ b/superset/superset_typing.py
@@ -57,6 +57,16 @@ class AdhocColumn(TypedDict, total=False):
sqlExpression: Optional[str]
+class ResultSetColumnType(TypedDict):
+ """
+ Superset virtual dataset column interface
+ """
+
+ name: str
+ type: Optional[str]
+ is_dttm: bool
+
+
CacheConfig = Dict[str, Any]
DbapiDescriptionRow = Tuple[
str, str, Optional[str], Optional[str], Optional[int], Optional[int], bool
diff --git a/superset/views/core.py b/superset/views/core.py
index 4dd7d4729f..6e329d1f48 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -2217,7 +2217,7 @@ class Superset(BaseSupersetView): # pylint: disable=too-many-public-methods
column_name=column_name,
filterable=True,
groupby=True,
- is_dttm=config_.get("is_date", False),
+ is_dttm=config_.get("is_dttm", False),
type=config_.get("type", False),
)
cols.append(col)
diff --git a/tests/integration_tests/celery_tests.py b/tests/integration_tests/celery_tests.py
index 802684ba3b..3d4ba5e901 100644
--- a/tests/integration_tests/celery_tests.py
+++ b/tests/integration_tests/celery_tests.py
@@ -130,8 +130,8 @@ def cta_result(ctas_method: CtasMethod):
if backend() != "presto":
return [], []
if ctas_method == CtasMethod.TABLE:
- return [{"rows": 1}], [{"name": "rows", "type": "BIGINT", "is_date": False}]
- return [{"result": True}], [{"name": "result", "type": "BOOLEAN", "is_date": False}]
+ return [{"rows": 1}], [{"name": "rows", "type": "BIGINT", "is_dttm": False}]
+ return [{"result": True}], [{"name": "result", "type": "BOOLEAN", "is_dttm": False}]
# TODO(bkyryliuk): quote table and schema names for all databases
diff --git a/tests/integration_tests/db_engine_specs/presto_tests.py b/tests/integration_tests/db_engine_specs/presto_tests.py
index 558f4322a0..17c7c2d900 100644
--- a/tests/integration_tests/db_engine_specs/presto_tests.py
+++ b/tests/integration_tests/db_engine_specs/presto_tests.py
@@ -207,8 +207,8 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
)
def test_presto_expand_data_with_simple_structural_columns(self):
cols = [
- {"name": "row_column", "type": "ROW(NESTED_OBJ VARCHAR)"},
- {"name": "array_column", "type": "ARRAY(BIGINT)"},
+ {"name": "row_column", "type": "ROW(NESTED_OBJ VARCHAR)", "is_dttm": False},
+ {"name": "array_column", "type": "ARRAY(BIGINT)", "is_dttm": False},
]
data = [
{"row_column": ["a"], "array_column": [1, 2, 3]},
@@ -218,9 +218,9 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
cols, data
)
expected_cols = [
- {"name": "row_column", "type": "ROW(NESTED_OBJ VARCHAR)"},
- {"name": "row_column.nested_obj", "type": "VARCHAR"},
- {"name": "array_column", "type": "ARRAY(BIGINT)"},
+ {"name": "row_column", "type": "ROW(NESTED_OBJ VARCHAR)", "is_dttm": False},
+ {"name": "row_column.nested_obj", "type": "VARCHAR", "is_dttm": False},
+ {"name": "array_column", "type": "ARRAY(BIGINT)", "is_dttm": False},
]
expected_data = [
@@ -232,7 +232,9 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{"array_column": 6, "row_column": "", "row_column.nested_obj": ""},
]
- expected_expanded_cols = [{"name": "row_column.nested_obj", "type": "VARCHAR"}]
+ expected_expanded_cols = [
+ {"name": "row_column.nested_obj", "type": "VARCHAR", "is_dttm": False}
+ ]
self.assertEqual(actual_cols, expected_cols)
self.assertEqual(actual_data, expected_data)
self.assertEqual(actual_expanded_cols, expected_expanded_cols)
@@ -247,6 +249,7 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{
"name": "row_column",
"type": "ROW(NESTED_OBJ1 VARCHAR, NESTED_ROW ROW(NESTED_OBJ2 VARCHAR))",
+ "is_dttm": False,
}
]
data = [{"row_column": ["a1", ["a2"]]}, {"row_column": ["b1", ["b2"]]}]
@@ -257,10 +260,19 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{
"name": "row_column",
"type": "ROW(NESTED_OBJ1 VARCHAR, NESTED_ROW ROW(NESTED_OBJ2 VARCHAR))",
+ "is_dttm": False,
+ },
+ {"name": "row_column.nested_obj1", "type": "VARCHAR", "is_dttm": False},
+ {
+ "name": "row_column.nested_row",
+ "type": "ROW(NESTED_OBJ2 VARCHAR)",
+ "is_dttm": False,
+ },
+ {
+ "name": "row_column.nested_row.nested_obj2",
+ "type": "VARCHAR",
+ "is_dttm": False,
},
- {"name": "row_column.nested_obj1", "type": "VARCHAR"},
- {"name": "row_column.nested_row", "type": "ROW(NESTED_OBJ2 VARCHAR)"},
- {"name": "row_column.nested_row.nested_obj2", "type": "VARCHAR"},
]
expected_data = [
{
@@ -278,9 +290,17 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
]
expected_expanded_cols = [
- {"name": "row_column.nested_obj1", "type": "VARCHAR"},
- {"name": "row_column.nested_row", "type": "ROW(NESTED_OBJ2 VARCHAR)"},
- {"name": "row_column.nested_row.nested_obj2", "type": "VARCHAR"},
+ {"name": "row_column.nested_obj1", "type": "VARCHAR", "is_dttm": False},
+ {
+ "name": "row_column.nested_row",
+ "type": "ROW(NESTED_OBJ2 VARCHAR)",
+ "is_dttm": False,
+ },
+ {
+ "name": "row_column.nested_row.nested_obj2",
+ "type": "VARCHAR",
+ "is_dttm": False,
+ },
]
self.assertEqual(actual_cols, expected_cols)
self.assertEqual(actual_data, expected_data)
@@ -296,6 +316,7 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{
"name": "row_column",
"type": "ROW(NESTED_ROW ROW(NESTED_OBJ VARCHAR))",
+ "is_dttm": False,
}
]
data = [
@@ -311,9 +332,18 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{
"name": "row_column",
"type": "ROW(NESTED_ROW ROW(NESTED_OBJ VARCHAR))",
+ "is_dttm": False,
+ },
+ {
+ "name": "row_column.nested_row",
+ "type": "ROW(NESTED_OBJ VARCHAR)",
+ "is_dttm": False,
+ },
+ {
+ "name": "row_column.nested_row.nested_obj",
+ "type": "VARCHAR",
+ "is_dttm": False,
},
- {"name": "row_column.nested_row", "type": "ROW(NESTED_OBJ VARCHAR)"},
- {"name": "row_column.nested_row.nested_obj", "type": "VARCHAR"},
]
expected_data = [
{
@@ -339,8 +369,16 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
]
expected_expanded_cols = [
- {"name": "row_column.nested_row", "type": "ROW(NESTED_OBJ VARCHAR)"},
- {"name": "row_column.nested_row.nested_obj", "type": "VARCHAR"},
+ {
+ "name": "row_column.nested_row",
+ "type": "ROW(NESTED_OBJ VARCHAR)",
+ "is_dttm": False,
+ },
+ {
+ "name": "row_column.nested_row.nested_obj",
+ "type": "VARCHAR",
+ "is_dttm": False,
+ },
]
self.assertEqual(actual_cols, expected_cols)
self.assertEqual(actual_data, expected_data)
@@ -353,10 +391,11 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
)
def test_presto_expand_data_with_complex_array_columns(self):
cols = [
- {"name": "int_column", "type": "BIGINT"},
+ {"name": "int_column", "type": "BIGINT", "is_dttm": False},
{
"name": "array_column",
"type": "ARRAY(ROW(NESTED_ARRAY ARRAY(ROW(NESTED_OBJ VARCHAR))))",
+ "is_dttm": False,
},
]
data = [
@@ -367,16 +406,22 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
cols, data
)
expected_cols = [
- {"name": "int_column", "type": "BIGINT"},
+ {"name": "int_column", "type": "BIGINT", "is_dttm": False},
{
"name": "array_column",
"type": "ARRAY(ROW(NESTED_ARRAY ARRAY(ROW(NESTED_OBJ VARCHAR))))",
+ "is_dttm": False,
},
{
"name": "array_column.nested_array",
"type": "ARRAY(ROW(NESTED_OBJ VARCHAR))",
+ "is_dttm": False,
+ },
+ {
+ "name": "array_column.nested_array.nested_obj",
+ "type": "VARCHAR",
+ "is_dttm": False,
},
- {"name": "array_column.nested_array.nested_obj", "type": "VARCHAR"},
]
expected_data = [
{
@@ -432,8 +477,13 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
{
"name": "array_column.nested_array",
"type": "ARRAY(ROW(NESTED_OBJ VARCHAR))",
+ "is_dttm": False,
+ },
+ {
+ "name": "array_column.nested_array.nested_obj",
+ "type": "VARCHAR",
+ "is_dttm": False,
},
- {"name": "array_column.nested_array.nested_obj", "type": "VARCHAR"},
]
self.assertEqual(actual_cols, expected_cols)
self.assertEqual(actual_data, expected_data)
@@ -545,12 +595,12 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
)
def test_presto_expand_data_array(self):
cols = [
- {"name": "event_id", "type": "VARCHAR", "is_date": False},
- {"name": "timestamp", "type": "BIGINT", "is_date": False},
+ {"name": "event_id", "type": "VARCHAR", "is_dttm": False},
+ {"name": "timestamp", "type": "BIGINT", "is_dttm": False},
{
"name": "user",
"type": "ROW(ID BIGINT, FIRST_NAME VARCHAR, LAST_NAME VARCHAR)",
- "is_date": False,
+ "is_dttm": False,
},
]
data = [
@@ -564,16 +614,16 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
cols, data
)
expected_cols = [
- {"name": "event_id", "type": "VARCHAR", "is_date": False},
- {"name": "timestamp", "type": "BIGINT", "is_date": False},
+ {"name": "event_id", "type": "VARCHAR", "is_dttm": False},
+ {"name": "timestamp", "type": "BIGINT", "is_dttm": False},
{
"name": "user",
"type": "ROW(ID BIGINT, FIRST_NAME VARCHAR, LAST_NAME VARCHAR)",
- "is_date": False,
+ "is_dttm": False,
},
- {"name": "user.id", "type": "BIGINT"},
- {"name": "user.first_name", "type": "VARCHAR"},
- {"name": "user.last_name", "type": "VARCHAR"},
+ {"name": "user.id", "type": "BIGINT", "is_dttm": False},
+ {"name": "user.first_name", "type": "VARCHAR", "is_dttm": False},
+ {"name": "user.last_name", "type": "VARCHAR", "is_dttm": False},
]
expected_data = [
{
@@ -586,9 +636,9 @@ class TestPrestoDbEngineSpec(TestDbEngineSpec):
}
]
expected_expanded_cols = [
- {"name": "user.id", "type": "BIGINT"},
- {"name": "user.first_name", "type": "VARCHAR"},
- {"name": "user.last_name", "type": "VARCHAR"},
+ {"name": "user.id", "type": "BIGINT", "is_dttm": False},
+ {"name": "user.first_name", "type": "VARCHAR", "is_dttm": False},
+ {"name": "user.last_name", "type": "VARCHAR", "is_dttm": False},
]
self.assertEqual(actual_cols, expected_cols)
diff --git a/tests/integration_tests/result_set_tests.py b/tests/integration_tests/result_set_tests.py
index bd44661d8d..626468fc5a 100644
--- a/tests/integration_tests/result_set_tests.py
+++ b/tests/integration_tests/result_set_tests.py
@@ -48,9 +48,9 @@ class TestSupersetResultSet(SupersetTestCase):
self.assertEqual(
results.columns,
[
- {"is_date": False, "type": "STRING", "name": "a"},
- {"is_date": False, "type": "STRING", "name": "b"},
- {"is_date": False, "type": "STRING", "name": "c"},
+ {"is_dttm": False, "type": "STRING", "name": "a"},
+ {"is_dttm": False, "type": "STRING", "name": "b"},
+ {"is_dttm": False, "type": "STRING", "name": "c"},
],
)
@@ -61,8 +61,8 @@ class TestSupersetResultSet(SupersetTestCase):
self.assertEqual(
results.columns,
[
- {"is_date": False, "type": "STRING", "name": "a"},
- {"is_date": False, "type": "INT", "name": "b"},
+ {"is_dttm": False, "type": "STRING", "name": "a"},
+ {"is_dttm": False, "type": "INT", "name": "b"},
],
)
@@ -76,11 +76,11 @@ class TestSupersetResultSet(SupersetTestCase):
self.assertEqual(
results.columns,
[
- {"is_date": False, "type": "FLOAT", "name": "a"},
- {"is_date": False, "type": "INT", "name": "b"},
- {"is_date": False, "type": "STRING", "name": "c"},
- {"is_date": True, "type": "DATETIME", "name": "d"},
- {"is_date": False, "type": "BOOL", "name": "e"},
+ {"is_dttm": False, "type": "FLOAT", "name": "a"},
+ {"is_dttm": False, "type": "INT", "name": "b"},
+ {"is_dttm": False, "type": "STRING", "name": "c"},
+ {"is_dttm": True, "type": "DATETIME", "name": "d"},
+ {"is_dttm": False, "type": "BOOL", "name": "e"},
],
)
diff --git a/tests/integration_tests/sqllab_tests.py b/tests/integration_tests/sqllab_tests.py
index 891d409a56..dbfd31e937 100644
--- a/tests/integration_tests/sqllab_tests.py
+++ b/tests/integration_tests/sqllab_tests.py
@@ -483,8 +483,8 @@ class TestSqlLab(SupersetTestCase):
"datasourceName": f"test_viz_flow_table_{random()}",
"schema": "superset",
"columns": [
- {"is_date": False, "type": "STRING", "name": f"viz_type_{random()}"},
- {"is_date": False, "type": "OBJECT", "name": f"ccount_{random()}"},
+ {"is_dttm": False, "type": "STRING", "name": f"viz_type_{random()}"},
+ {"is_dttm": False, "type": "OBJECT", "name": f"ccount_{random()}"},
],
"sql": """\
SELECT *
@@ -513,8 +513,8 @@ class TestSqlLab(SupersetTestCase):
"chartType": "dist_bar",
"schema": "superset",
"columns": [
- {"is_date": False, "type": "STRING", "name": f"viz_type_{random()}"},
- {"is_date": False, "type": "OBJECT", "name": f"ccount_{random()}"},
+ {"is_dttm": False, "type": "STRING", "name": f"viz_type_{random()}"},
+ {"is_dttm": False, "type": "OBJECT", "name": f"ccount_{random()}"},
],
"sql": """\
SELECT *