Skip to content
Snippets Groups Projects
Commit 543aa0d9 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #2382 from metabase/dont-always-cast-datetimes

Skip casting a column if its unit is `:default` in the query
parents e433584d 57396dee
Branches
Tags
No related merge requests found
......@@ -255,7 +255,7 @@
(defn- date [unit expr]
{:pre [expr]}
(case unit
:default (kx/->timestamp expr)
:default expr
:minute (trunc-with-format "%Y-%m-%d %H:%M:00" expr)
:minute-of-hour (kx/minute expr)
:hour (trunc-with-format "%Y-%m-%d %H:00:00" expr)
......
......@@ -141,7 +141,7 @@
(defn- date [_ unit expr]
(case unit
:default (kx/->timestamp expr)
:default expr
:minute (trunc-with-format "yyyyMMddHHmm" expr)
:minute-of-hour (kx/minute expr)
:hour (trunc-with-format "yyyyMMddHH" expr)
......
......@@ -83,7 +83,7 @@
(defn- date [_ unit expr]
(case unit
:default (k/sqlfn :TIMESTAMP expr)
:default expr
:minute (trunc-with-format "%Y-%m-%d %H:%i" expr)
:minute-of-hour (kx/minute expr)
:hour (trunc-with-format "%Y-%m-%d %H" expr)
......
......@@ -118,7 +118,7 @@
(defn- date [_ unit expr]
(case unit
:default (kx/->timestamp expr)
:default expr
:minute (date-trunc :minute expr)
:minute-of-hour (extract-integer :minute expr)
:hour (date-trunc :hour expr)
......
......@@ -43,7 +43,7 @@
(kx/literal (u/date->iso-8601 expr))
expr)]
(case unit
:default (->datetime v)
:default v
:second (->datetime (strftime "%Y-%m-%d %H:%M:%S" v))
:minute (->datetime (strftime "%Y-%m-%d %H:%M" v))
:minute-of-hour (kx/->integer (strftime "%M" v))
......
......@@ -80,7 +80,7 @@
"See also the [jTDS SQL <-> Java types table](http://jtds.sourceforge.net/typemap.html)"
[unit expr]
(case unit
:default (kx/->datetime expr)
:default expr
:minute (kx/cast :SMALLDATETIME expr)
:minute-of-hour (date-part :minute expr)
:hour (kx/->datetime (kx/format "yyyy-MM-dd HH:00:00" expr))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment