From 452e82a369a8895df8f83fa457ab9a46059e154e Mon Sep 17 00:00:00 2001 From: Joe Li Date: Fri, 5 May 2023 14:44:44 -0700 Subject: [PATCH] Revert "fix(datasource): saving new calculated columns (#23783)" This reverts commit 742c2cd8fb13090a858f4f35088b4113c009a6b5. --- superset-frontend/src/components/Datasource/DatasourceModal.tsx | 2 +- superset/datasets/schemas.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx index 5e985ca374b44..b5b698f8315bb 100644 --- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx +++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx @@ -139,7 +139,7 @@ const DatasourceModal: FunctionComponent = ({ ), columns: currentDatasource?.columns?.map( (column: Record) => ({ - id: typeof column.id === 'number' ? column.id : undefined, + id: column.id, column_name: column.column_name, type: column.type, advanced_data_type: column.advanced_data_type, diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py index 41759c2e84ab8..eaf5963fdf32e 100644 --- a/superset/datasets/schemas.py +++ b/superset/datasets/schemas.py @@ -45,7 +45,7 @@ def validate_python_date_format(value: str) -> None: class DatasetColumnsPutSchema(Schema): - id = fields.Integer(required=False) + id = fields.Integer() column_name = fields.String(required=True, validate=Length(1, 255)) type = fields.String(allow_none=True) advanced_data_type = fields.String(allow_none=True, validate=Length(1, 255))