From 6bc4df0b2eea7d98e2ab0df96293775ed2967f21 Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Thu, 23 Sep 2021 14:37:33 -0700 Subject: [PATCH] Rebase --- superset/connectors/sqla/models.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index 6c5a9f2fa6d15..c87b4c2145804 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -651,9 +651,7 @@ def external_metadata(self) -> List[Dict[str, str]]: if self.sql: return get_virtual_table_metadata(dataset=self) return get_physical_table_metadata( - database=self.database, - table_name=self.table_name, - schema_name=self.schema, + database=self.database, table_name=self.table_name, schema_name=self.schema, ) @property @@ -918,10 +916,7 @@ def _get_sqla_row_level_filters( return [or_(*clauses) for clauses in filters_grouped.values()] except TemplateError as ex: raise QueryObjectValidationError( - _( - "Error in jinja expression in RLS filters: %(msg)s", - msg=ex.message, - ) + _("Error in jinja expression in RLS filters: %(msg)s", msg=ex.message,) ) from ex def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements @@ -1349,9 +1344,7 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma orderby = [ ( self._get_series_orderby( - series_limit_metric, - metrics_by_name, - columns_by_name, + series_limit_metric, metrics_by_name, columns_by_name, ), False, ) @@ -1425,10 +1418,7 @@ def _get_series_orderby( return ob def _get_top_groups( - self, - df: pd.DataFrame, - dimensions: List[str], - groupby_exprs: Dict[str, Any], + self, df: pd.DataFrame, dimensions: List[str], groupby_exprs: Dict[str, Any], ) -> ColumnElement: column_map = {column.column_name: column for column in self.columns} groups = []