From 7b01822f76b756d4c251b4c689c2ca4ea06c436f Mon Sep 17 00:00:00 2001
From: Jack Fragassi <jfragassi98@gmail.com>
Date: Thu, 18 May 2023 01:12:02 -0700
Subject: [PATCH] Fixes

---
 .../src/components/Datasource/DatasourceModal.tsx           | 2 +-
 superset/datasets/schemas.py                                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index 5e985ca374b4..1a7bf227ec35 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -150,7 +150,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
             groupby: column.groupby,
             is_active: column.is_active,
             is_dttm: column.is_dttm,
-            python_date_format: column.python_date_format,
+            python_date_format: column.python_date_format || null,
             uuid: column.uuid,
             extra: buildExtraJsonObject(column),
           }),
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index 41759c2e84ab..2d471781e050 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -34,14 +34,14 @@ def validate_python_date_format(value: str) -> None:
         r"""
         ^(
             epoch_s|epoch_ms|
-            (?P<date>%Y(-%m(-%d)?)?)([\sT](?P<time>%H(:%M(:%S(\.%f)?)?)?))?
+            (?P<date>%Y([-/]%m([-/]%d)?)?)([\sT](?P<time>%H(:%M(:%S(\.%f)?)?)?))?
         )$
         """,
         re.VERBOSE,
     )
     match = regex.match(value or "")
     if not match:
-        raise ValidationError(_("Invalid date/timestamp format"))
+        raise ValidationError([_("Invalid date/timestamp format")])
 
 
 class DatasetColumnsPutSchema(Schema):
@@ -56,7 +56,7 @@ class DatasetColumnsPutSchema(Schema):
     filterable = fields.Boolean()
     groupby = fields.Boolean()
     is_active = fields.Boolean(allow_none=True)
-    is_dttm = fields.Boolean(dump_default=False)
+    is_dttm = fields.Boolean(allow_none=True, dump_default=False)
     python_date_format = fields.String(
         allow_none=True, validate=[Length(1, 255), validate_python_date_format]
     )