This is an automated email from the ASF dual-hosted git repository. lyndsi pushed a commit to branch lyndsi/sql-lab-new-explore-button-functionality-and-move-save-dataset-to-split-save-button in repository https://gitbox.apache.org/repos/asf/superset.git
commit 53563031f37d0df7e3f3249c392579a17617c664 Author: Hugh A. Miles II <[email protected]> AuthorDate: Wed Jul 6 12:36:29 2022 +0000 fixed from master --- superset/models/helpers.py | 3 --- superset/models/sql_lab.py | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/superset/models/helpers.py b/superset/models/helpers.py index 2e5aafe64b..501408f71a 100644 --- a/superset/models/helpers.py +++ b/superset/models/helpers.py @@ -1048,10 +1048,7 @@ class ExploreMixin: # pylint: disable=too-many-public-methods if expression_type == utils.AdhocMetricExpressionType.SIMPLE: metric_column = metric.get("column") or {} column_name = cast(str, metric_column.get("column_name")) - table_column: Optional["TableColumn"] = columns_by_name.get(column_name) sqla_column = sa.column(column_name) - if table_column: - sqla_column = table_column.get_sqla_col() sqla_metric = self.sqla_aggregations[metric["aggregate"]](sqla_column) elif expression_type == utils.AdhocMetricExpressionType.SQL: expression = self._process_sql_expression( # type: ignore diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py index dc5f3dd51d..6e8fc542cb 100644 --- a/superset/models/sql_lab.py +++ b/superset/models/sql_lab.py @@ -279,6 +279,10 @@ class Query(Model, ExtraJSONMixin, ExploreMixin): # pylint: disable=abstract-me def dttm_cols(self) -> List[Any]: return [col.get("column_name") for col in self.columns if col.get("is_dttm")] + @property + def default_endpoint(self) -> str: + return "" + @staticmethod def get_extra_cache_keys(query_obj: Dict[str, Any]) -> List[str]: return []
