diff --git a/src/metabase/upload/parsing.clj b/src/metabase/upload/parsing.clj index 97ed156e450e9f23338ab8e164f010380a9fbe54..6ec6749c70c20b8f44973fa053cbb43bbe2751c7 100644 --- a/src/metabase/upload/parsing.clj +++ b/src/metabase/upload/parsing.clj @@ -37,10 +37,10 @@ ;; uuuu is like yyyy but is required for strict parsing and also supports negative years for BC dates ;; see https://stackoverflow.com/questions/41103603/issue-with-datetimeparseexception-when-using-strict-resolver-style ;; uuuu is faster than using yyyy and setting a default era - ["MMM dd uuuu" ; Jan 30 2000 - "MMM dd, uuuu" ; Jan 30, 2000 - "dd MMM uuuu" ; 30 Jan 2000 - "dd MMM, uuuu" ; 30 Jan, 2000 + ["MMM d uuuu" ; Jan 30 2000 + "MMM d, uuuu" ; Jan 30, 2000 + "d MMM uuuu" ; 30 Jan 2000 + "d MMM, uuuu" ; 30 Jan, 2000 "MMMM d uuuu" ; January 30 2000 "MMMM d, uuuu" ; January 30, 2000 "d MMMM uuuu" ; 30 January 2000 @@ -65,10 +65,10 @@ Supported formats: - yyyy-MM-dd - - MMM dd yyyy - - MMM dd, yyyy - - dd MMM yyyy - - dd MMM, yyyy + - MMM d yyyy + - MMM d, yyyy + - d MMM yyyy + - d MMM, yyyy - MMMM d yyyy - MMMM d, yyyy - d MMMM yyyy diff --git a/test/metabase/upload_test.clj b/test/metabase/upload_test.clj index f8915e5d9386ff210cb590ecb51e3396b3547516..706dfc5e75994142b6e95665883708fa77dade21 100644 --- a/test/metabase/upload_test.clj +++ b/test/metabase/upload_test.clj @@ -169,18 +169,28 @@ [" 2022-01-01 " #t "2022-01-01" date-type] [" 2022-02-30 " " 2022-02-30 " vchar-type] [" -2022-01-01 " #t "-2022-01-01" date-type] - [" Jan 30 2018" #t "2018-01-30" date-type] + [" Jan 1 2018" #t "2018-01-01" date-type] + [" Jan 02 2018" #t "2018-01-02" date-type] [" Jan 30 -2018" #t "-2018-01-30" date-type] - [" Jan 30, 2018" #t "2018-01-30" date-type] + [" Jan 1, 2018" #t "2018-01-01" date-type] + [" Jan 02, 2018" #t "2018-01-02" date-type] [" Feb 30, 2018" " Feb 30, 2018" vchar-type] - [" 30 Jan 2018" #t "2018-01-30" date-type] - [" 30 Jan, 2018" #t "2018-01-30" date-type] - [" January 30 2018" #t "2018-01-30" date-type] - [" January 30, 2018" #t "2018-01-30" date-type] - [" 30 January 2018" #t "2018-01-30" date-type] - [" 30 January, 2018" #t "2018-01-30" date-type] - [" Sunday, January 30 2000" #t "2000-01-30" date-type] - [" Sunday, January 30, 2000" #t "2000-01-30" date-type] + [" 1 Jan 2018" #t "2018-01-01" date-type] + [" 02 Jan 2018" #t "2018-01-02" date-type] + [" 1 Jan, 2018" #t "2018-01-01" date-type] + [" 02 Jan, 2018" #t "2018-01-02" date-type] + [" January 1 2018" #t "2018-01-01" date-type] + [" January 02 2018" #t "2018-01-02" date-type] + [" January 1, 2018" #t "2018-01-01" date-type] + [" January 02, 2018" #t "2018-01-02" date-type] + [" 1 January 2018" #t "2018-01-01" date-type] + [" 02 January 2018" #t "2018-01-02" date-type] + [" 1 January, 2018" #t "2018-01-01" date-type] + [" 02 January, 2018" #t "2018-01-02" date-type] + [" Saturday, January 1 2000" #t "2000-01-01" date-type] + [" Sunday, January 02 2000" #t "2000-01-02" date-type] + [" Saturday, January 1, 2000" #t "2000-01-01" date-type] + [" Sunday, January 02, 2000" #t "2000-01-02" date-type] [" 2022-01-01T01:00 " #t "2022-01-01T01:00" datetime-type] [" 2022-01-01t01:00 " #t "2022-01-01T01:00" datetime-type] [" 2022-01-01 01:00 " #t "2022-01-01T01:00" datetime-type]