Antonio-RiveroMartnez commented on code in PR #22853:
URL: https://github.com/apache/superset/pull/22853#discussion_r1113444910
##########
superset/models/sql_lab.py:
##########
@@ -183,47 +184,33 @@ def sql_tables(self) -> List[Table]:
return list(ParsedQuery(self.sql).tables)
@property
- def columns(self) -> List[Dict[str, Any]]:
- bool_types = ("BOOL",)
- num_types = (
- "DOUBLE",
- "FLOAT",
- "INT",
- "BIGINT",
- "NUMBER",
- "LONG",
- "REAL",
- "NUMERIC",
- "DECIMAL",
- "MONEY",
+ def columns(self) -> List["TableColumn"]:
+ from superset.connectors.sqla.models import ( # pylint:
disable=import-outside-toplevel
+ TableColumn,
)
- date_types = ("DATE", "TIME")
- str_types = ("VARCHAR", "STRING", "CHAR")
+
columns = []
- col_type = ""
for col in self.extra.get("columns", []):
- computed_column = {**col}
- col_type = col.get("type")
-
- if col_type and any(map(lambda t: t in col_type.upper(),
str_types)):
- computed_column["type_generic"] = GenericDataType.STRING
- if col_type and any(map(lambda t: t in col_type.upper(),
bool_types)):
- computed_column["type_generic"] = GenericDataType.BOOLEAN
- if col_type and any(map(lambda t: t in col_type.upper(),
num_types)):
- computed_column["type_generic"] = GenericDataType.NUMERIC
- if col_type and any(map(lambda t: t in col_type.upper(),
date_types)):
- computed_column["type_generic"] = GenericDataType.TEMPORAL
-
- computed_column["column_name"] = col.get("name")
- computed_column["groupby"] = True
- columns.append(computed_column)
+ columns.append(
+ TableColumn(
+ column_name=col["name"],
+ type=col["type"],
+ is_dttm=col["is_dttm"],
+ groupby=True,
Review Comment:
I know this is not new on this PR, but wondering, why do we set
`groupby=True` here? Shouldn't this be set based on the `col` properties?
##########
superset/models/sql_lab.py:
##########
@@ -183,47 +184,33 @@ def sql_tables(self) -> List[Table]:
return list(ParsedQuery(self.sql).tables)
@property
- def columns(self) -> List[Dict[str, Any]]:
- bool_types = ("BOOL",)
- num_types = (
- "DOUBLE",
- "FLOAT",
- "INT",
- "BIGINT",
- "NUMBER",
- "LONG",
- "REAL",
- "NUMERIC",
- "DECIMAL",
- "MONEY",
+ def columns(self) -> List["TableColumn"]:
+ from superset.connectors.sqla.models import ( # pylint:
disable=import-outside-toplevel
+ TableColumn,
)
- date_types = ("DATE", "TIME")
- str_types = ("VARCHAR", "STRING", "CHAR")
+
columns = []
- col_type = ""
for col in self.extra.get("columns", []):
- computed_column = {**col}
- col_type = col.get("type")
-
- if col_type and any(map(lambda t: t in col_type.upper(),
str_types)):
- computed_column["type_generic"] = GenericDataType.STRING
- if col_type and any(map(lambda t: t in col_type.upper(),
bool_types)):
- computed_column["type_generic"] = GenericDataType.BOOLEAN
- if col_type and any(map(lambda t: t in col_type.upper(),
num_types)):
- computed_column["type_generic"] = GenericDataType.NUMERIC
- if col_type and any(map(lambda t: t in col_type.upper(),
date_types)):
- computed_column["type_generic"] = GenericDataType.TEMPORAL
-
- computed_column["column_name"] = col.get("name")
- computed_column["groupby"] = True
- columns.append(computed_column)
+ columns.append(
+ TableColumn(
+ column_name=col["name"],
+ type=col["type"],
+ is_dttm=col["is_dttm"],
+ groupby=True,
+ filterable=True,
Review Comment:
Before we were not setting `filterable` as `True`, but we do now. Is this
intentional?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
