Print java.sql.Timestamps as #inst literals

Author: nwjsmith

src/lambdaisland/deep_diff/printer.clj

@@ -7,7 +7,8 @@
             [arrangement.core]
             [lambdaisland.deep-diff.diff :as diff])
   (:import (java.text SimpleDateFormat)
-           (java.util TimeZone)))
+           (java.util TimeZone)
+           (java.sql Timestamp)))
 
 (defn print-deletion [printer expr]
   (let [no-color (assoc printer :print-color false)]
@@ -47,6 +48,18 @@
     'inst
     #(.format ^SimpleDateFormat (.get thread-local-utc-date-format) %)))
 
+(def ^:private ^ThreadLocal thread-local-utc-timestamp-format
+  (proxy [ThreadLocal] []
+    (initialValue []
+      (doto (SimpleDateFormat. "yyyy-MM-dd'T'HH:mm:ss")
+        (.setTimeZone (TimeZone/getTimeZone "GMT"))))))
+
+(def ^:private print-timestamp
+  (puget/tagged-handler
+    'inst
+    #(str (.format ^SimpleDateFormat (.get thread-local-utc-timestamp-format) %)
+          (format ".%09d-00:00" (.getNanos ^Timestamp %)))))
+
 (def ^:private print-handlers
   {'lambdaisland.deep_diff.diff.Deletion
    print-deletion
@@ -90,6 +103,9 @@
    'java.util.Date
    print-date
 
+   'java.sql.Timestamp
+   print-timestamp
+
    'java.util.UUID
    (puget/tagged-handler 'uuid str)})
 

test/lambdaisland/deep_diff/printer_test.clj

@@ -1,7 +1,8 @@
 (ns lambdaisland.deep-diff.printer-test
   (:require [clojure.test :refer :all]
             [lambdaisland.deep-diff.diff :as diff]
-            [lambdaisland.deep-diff.printer :as printer]))
+            [lambdaisland.deep-diff.printer :as printer])
+  (:import (java.sql Timestamp)))
 
 (defn- printed
   [diff]
@@ -15,6 +16,12 @@
     (is (= "\u001B[31m-#inst \"2019-04-09T14:57:46.128-00:00\"\u001B[0m \u001B[32m+#inst \"2019-04-10T14:57:46.128-00:00\"\u001B[0m\n"
            (printed (diff/diff #inst "2019-04-09T14:57:46.128-00:00"
                                #inst "2019-04-10T14:57:46.128-00:00")))))
+
+  (testing "timestamp"
+    (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000000000-00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.000000101-00:00\"\u001B[0m\n"
+           (printed (diff/diff (Timestamp. 0)
+                               (doto (Timestamp. 1000) (.setNanos 101)))))))
+
   (testing "uuid"
     (is (= "\u001B[31m-#uuid \"e41b325a-ce9d-4fdd-b51d-280d9c91314d\"\u001B[0m \u001B[32m+#uuid \"0400be9a-619f-4c6a-a735-6245e4955995\"\u001B[0m\n"
            (printed (diff/diff #uuid "e41b325a-ce9d-4fdd-b51d-280d9c91314d"