Emulate Time data type (ClickHouse#7)

deathalt · Apr 11, 2019 · 62ebd20 · 62ebd20
1 parent 292d15b
commit 62ebd20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/metabase/driver/clickhouse.clj b/src/metabase/driver/clickhouse.clj
@@ -20,8 +20,8 @@
              [date :as du]
              [honeysql-extensions :as hx]]
             [schema.core :as sc])
-  (:import [java.sql DatabaseMetaData Time]
-           java.util.Date))
+  (:import [java.sql DatabaseMetaData ResultSet Time Types]
+           [java.util Calendar Date]))
 
 (driver/register! :clickhouse, :parent :sql-jdbc)
 
@@ -200,7 +200,7 @@
 ;; See above. We are removing the artificial alias suffix
 (defmethod driver/execute-query :clickhouse [driver query]
   (update-in
-   (sql-jdbc.execute/execute-query :sql-jdbc query)
+   (sql-jdbc.execute/execute-query driver query)
    [:columns]
    (fn [columns]
      (mapv (fn [column]
@@ -209,6 +209,12 @@
                column))
            columns))))
 
+(defmethod sql-jdbc.execute/read-column [:clickhouse Types/TIMESTAMP] [driver calendar resultset meta i]
+  (when-let [timestamp (.getTimestamp resultset i)]
+    (if (string/starts-with? (.toString timestamp) "1970-01-01")
+      (Time. (.getTime timestamp))
+      ((get-method sql-jdbc.execute/read-column [:sql-jdbc Types/TIMESTAMP]) driver calendar resultset meta i))))
+
 (defn- get-tables
   "Fetch a JDBC Metadata ResultSet of tables in the DB, optionally limited to ones belonging to a given schema."
   [^DatabaseMetaData metadata, ^String schema-or-nil, ^String db-name-or-nil]

diff --git a/test/metabase/test/data/clickhouse.clj b/test/metabase/test/data/clickhouse.clj
@@ -23,10 +23,7 @@
 (defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/Text]       [_ _] "String")
 (defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/UUID]       [_ _] "UUID")
 
-;; If someone tries to run Time column tests with ClickHouse give them a heads up that
-;; ClickHouse does not support it
-(defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/Time]       [_ _]
-  (throw (UnsupportedOperationException. "ClickHouse does not have a TIME data type.")))
+(defmethod sql.tx/field-base-type->sql-type [:clickhouse :type/Time]       [_ _] "DateTime")
 
 (defmethod tx/dbdef->connection-details :clickhouse [_ context {:keys [database-name]}]
     (merge