Fix report-timezones and Presto [ci drivers]

src/metabase/driver/presto.clj

@@ -18,7 +18,9 @@
             [metabase.query-processor.util :as qputil]
             [metabase.util
              [honeysql-extensions :as hx]
-             [ssh :as ssh]])
+             [ssh :as ssh]]
+            [clj-time.format :as tformat]
+            [clj-time.core :as time])
   (:import java.util.Date
            [metabase.query_processor.interface DateTimeValue Value]))
 
@@ -40,25 +42,34 @@
 
 (defn- parse-time-with-tz [s]
   ;; Try parsing with offset first then with full ZoneId
+  (println "getting ready to parse " s)
   (or (u/ignore-exceptions (u/parse-date "HH:mm:ss.SSS ZZ" s))
       (u/parse-date "HH:mm:ss.SSS ZZZ" s)))
 
 (defn- parse-timestamp-with-tz [s]
   ;; Try parsing with offset first then with full ZoneId
+  (println "getting ready to parse " s)
   (or (u/ignore-exceptions (u/parse-date "yyyy-MM-dd HH:mm:ss.SSS ZZ" s))
       (u/parse-date "yyyy-MM-dd HH:mm:ss.SSS ZZZ" s)))
 
-(defn- field-type->parser [field-type]
+(def ^:private presto-date-time-formatter
+  (u/->DateTimeFormatter "yyyy-MM-dd HH:mm:ss.SSS"))
+
+(defn- field-type->parser [report-timezone field-type]
   (condp re-matches field-type
     #"decimal.*"                bigdec
     #"time"                     (partial u/parse-date :hour-minute-second-ms)
     #"time with time zone"      parse-time-with-tz
-    #"timestamp"                (partial u/parse-date "yyyy-MM-dd HH:mm:ss.SSS")
+    #"timestamp"                (partial u/parse-date
+                                         (if-let [report-tz (and report-timezone
+                                                                 (time/time-zone-for-id report-timezone))]
+                                           (tformat/with-zone presto-date-time-formatter report-tz)
+                                           presto-date-time-formatter))
     #"timestamp with time zone" parse-timestamp-with-tz
     #".*"                       identity))
 
-(defn- parse-presto-results [columns data]
-  (let [parsers (map (comp field-type->parser :type) columns)]
+(defn- parse-presto-results [report-timezone columns data]
+  (let [parsers (map (comp #(field-type->parser report-timezone %) :type) columns)]
     (for [row data]
       (for [[value parser] (partition 2 (interleave row parsers))]
         (when (some? value)
@@ -68,7 +79,7 @@
   (let [{{:keys [columns data nextUri error]} :body} (http/get uri (assoc (details->request details) :as :json))]
     (when error
       (throw (ex-info (or (:message error) "Error running query.") error)))
-    (let [rows    (parse-presto-results columns data)
+    (let [rows    (parse-presto-results (:report-timezone details) columns data)
           results {:columns (or columns prev-columns)
                    :rows    (vec (concat prev-rows rows))}]
       (if (nil? nextUri)
@@ -82,7 +93,7 @@
                                                                   (assoc (details->request details-with-tunnel) :body query, :as :json))]
       (when error
         (throw (ex-info (or (:message error) "Error preparing query.") error)))
-      (let [rows    (parse-presto-results (or columns []) (or data []))
+      (let [rows    (parse-presto-results (:report-timezone details) (or columns []) (or data []))
             results {:columns (or columns [])
                      :rows    rows}]
         (if (nil? nextUri)

test/metabase/driver/presto_test.clj

@@ -52,12 +52,14 @@
     #inst "2017-04-03T10:19:17.417000000-00:00"
     3.1416M
     "test"]]
-  (parse-presto-results [{:type "date"} {:type "timestamp with time zone"} {:type "timestamp"} {:type "decimal(10,4)"} {:type "varchar(255)"}]
+  (parse-presto-results nil
+                        [{:type "date"} {:type "timestamp with time zone"} {:type "timestamp"} {:type "decimal(10,4)"} {:type "varchar(255)"}]
                         [["2017-04-03", "2017-04-03 10:19:17.417 America/Toronto", "2017-04-03 10:19:17.417", "3.1416", "test"]]))
 
 (expect
   [[0, false, "", nil]]
-  (parse-presto-results [{:type "integer"} {:type "boolean"} {:type "varchar(255)"} {:type "date"}]
+  (parse-presto-results nil
+                        [{:type "integer"} {:type "boolean"} {:type "varchar(255)"} {:type "date"}]
                         [[0, false, "", nil]]))
 
 (expect

test/metabase/query_processor_test/unix_timestamp_test.clj

@@ -14,12 +14,11 @@
   (if (i/has-questionable-timezone-support? *driver*)
     10
     9)
-  (tu/with-temporary-setting-values [report-timezone "America/Los_Angeles"]
-    (count (rows (data/dataset sad-toucan-incidents
-                               (data/run-query incidents
-                                               (ql/filter (ql/and (ql/> $timestamp "2015-06-01")
-                                                                  (ql/< $timestamp "2015-06-03")))
-                                               (ql/order-by (ql/asc $timestamp))))))))
+  (count (rows (data/dataset sad-toucan-incidents
+                 (data/run-query incidents
+                   (ql/filter (ql/and (ql/> $timestamp "2015-06-01")
+                                      (ql/< $timestamp "2015-06-03")))
+                   (ql/order-by (ql/asc $timestamp)))))))
 
 (expect-with-non-timeseries-dbs
   (cond