Skip to content

Commit

Permalink
Rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
betodealmeida committed Sep 23, 2021
1 parent ed6ae07 commit 6bc4df0
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions superset/connectors/sqla/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
Expand Down Expand Up @@ -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 = []
Expand Down

0 comments on commit 6bc4df0

Please sign in to comment.