QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: BigQuery cannot accept Time Grain (#21489)

Browse Source
This commit is contained in:
Yongjie Zhao
2022-09-16 15:19:24 +08:00
committed by GitHub
parent 324e9979fa
commit 33509ab7da
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
View File

@@ -57,7 +57,7 @@ import {
DEFAULT_NUMBER_FORMAT,
} from '../utils';
import { TIME_FILTER_LABELS } from '../constants';
import { SharedControlConfig, Dataset } from '../types';
import { SharedControlConfig, Dataset, ColumnMeta } from '../types';
import {
dndAdhocFilterControl,
@@ -197,12 +197,10 @@ const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
if (isAdhocColumn(xAxisValue)) {
return true;
}
if (isPhysicalColumn(xAxisValue) && Array.isArray(xAxis?.options)) {
for (let i = 0; i < xAxis.options.length; i += 1) {
if (xAxis.options[i].column_name === xAxisValue) {
return !!xAxis.options[i].is_dttm;
}
}
if (isPhysicalColumn(xAxisValue)) {
return !!(xAxis?.options ?? []).find(
(col: ColumnMeta) => col?.column_name === xAxisValue,
)?.is_dttm;
}
return false;
},

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

@@ -1144,9 +1144,10 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho
and (time_grain := col.get("timeGrain"))
):
sqla_column = self.db_engine_spec.get_timestamp_expr(
sqla_column,
None,
time_grain,
col=sqla_column,
pdf=None,
time_grain=time_grain,
type_=str(getattr(sqla_column, "type", "")),
)
return self.make_sqla_column_compatible(sqla_column, label)