pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Correct raw metrics handling in verbose map

This commit is contained in:
mcdogg17 2024-06-30 19:48:25 +05:00
parent fc9bc175e6
commit 5f318de8c6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
superset/connectors/sqla/models.py
View File

@ -172,7 +172,8 @@ class DatasourceKind(StrEnum):
PHYSICAL = "physical"
class BaseDatasource(AuditMixinNullable, ImportExportMixin): # pylint: disable=too-many-public-methods
class BaseDatasource(AuditMixinNullable,
ImportExportMixin): # pylint: disable=too-many-public-methods
"""A common interface to objects that are queryable
(tables and datasources)"""
@ -361,12 +362,11 @@ class BaseDatasource(AuditMixinNullable, ImportExportMixin): # pylint: disable=
@property
def verbose_map(self) -> dict[str, str]:
verb_map = {"__timestamp": "Time"}
verb_map.update(
{o.metric_name: o.verbose_name or o.metric_name for o in self.metrics}
)
verb_map.update(
{o.column_name: o.verbose_name or o.column_name for o in self.columns}
)
verb_map.update({o.metric_name: verb_map.setdefault(
o.metric_name, o.verbose_name or o.metric_name) for o in self.metrics})
verb_map.update({o.column_name: verb_map.setdefault(
o.column_name, o.verbose_name or o.column_name) for o in self.columns})
return verb_map
@property
@ -498,7 +498,7 @@ class BaseDatasource(AuditMixinNullable, ImportExportMixin): # pylint: disable=
verbose_map.update(
{
column_["column_name"]: column_["verbose_name"]
or column_["column_name"]
or column_["column_name"]
for column_ in filtered_columns
}
)
@ -541,9 +541,9 @@ class BaseDatasource(AuditMixinNullable, ImportExportMixin): # pylint: disable=
target_generic_type == utils.GenericDataType.NUMERIC
and operator
not in {
utils.FilterOperator.ILIKE,
utils.FilterOperator.LIKE,
}
utils.FilterOperator.ILIKE,
utils.FilterOperator.LIKE,
}
):
# For backwards compatibility and edge cases
# where a column data type might have changed
@ -1716,7 +1716,7 @@ class SqlaTable(
_("Db engine did not return all queried columns")
)
if len(df.columns) > len(labels_expected):
df = df.iloc[:, 0 : len(labels_expected)]
df = df.iloc[:, 0: len(labels_expected)]
df.columns = labels_expected
return df