pre-java8: add instant->sql-timestamp

Author: Vadim Platonov

CHANGELOG.md

@@ -7,6 +7,7 @@
 * `zone-id?` predicate
 * `set-clock!` - sets the mocked clock value to the supplied instant
 * `when-joda-time-loaded` - macro which runs code when Joda-Time is on the classpath
+* `instant->sql-timestamp` - produce a `java.sql.Timestamp` from an Instant-like object
 
 ## 0.3.1
 

src/java_time.clj

@@ -64,7 +64,7 @@
    format formatter]
 
   [java-time.pre-java8
-   java-date sql-date sql-timestamp sql-time]
+   java-date sql-date sql-timestamp instant->sql-timestamp sql-time]
 
   [java-time.interval
    move-start-to move-end-to move-start-by move-end-by

src/java_time/pre_java8.clj

@@ -1,5 +1,6 @@
 (ns java-time.pre-java8
   (:require [java-time
+             [convert :as jt.c]
              [local :as jt.l]
              [temporal :as jt.t]
              [defconversion :refer [conversion!]]]))
@@ -40,7 +41,7 @@
 
 (defsqldate java.sql.Date sql-date jt.l/local-date 3
   "Creates a `java.sql.Date` out of any combination of arguments valid for
-  `java-time/local-date` or the LocalDate itself.
+  `java-time/local-date` or the `LocalDate` itself.
 
   Please consider using the JSR-310 Java Time types instead of `java.sql.Date`
   if your drivers support them.
@@ -50,8 +51,13 @@
   conversion from/to native JDBC driver DATE types.")
 
 (defsqldate java.sql.Timestamp sql-timestamp jt.l/local-date-time 7
-  "Creates a `java.sql.Timestamp` out of any combination of arguments valid for
-  `java-time/local-date-time` or the LocalDateTime itself.
+  "Creates a `java.sql.Timestamp` in the local timezone out of any combination
+  of arguments valid for `java-time/local-date-time` or the `LocalDateTime`
+  itself.
+
+  The `sql-timestamp` constructor function does not support `Timestamp`
+  construction from an `Instant` or a long millis value. Please use
+  `instant->sql-timestamp` for this purpose.
 
   Please consider using the JSR-310 Java Time types instead of
   `java.sql.Timestamp` if your drivers support them.
@@ -60,9 +66,24 @@
   as a local date-time (no timezone) for the purposes of conversion from/to native
   JDBC driver TIMESTAMP types.")
 
+(defn instant->sql-timestamp
+  "Creates a `java.sql.Timestamp` from the provided `instant-or-millis` - a
+  millisecond numeric time value or something convertible to an `Instant`.
+
+  Please consider using the JSR-310 Java Time types instead of
+  `java.sql.Timestamp` if your drivers support them.
+
+  `java.sql.Timestamp` is a version of a `java.util.Date` supposed to be used
+  as a local date-time (no timezone) for the purposes of conversion from/to native
+  JDBC driver TIMESTAMP types."
+  [instant-or-millis]
+  (if (number? instant-or-millis)
+    (java.sql.Timestamp. (long instant-or-millis))
+    (java.sql.Timestamp/from (jt.t/instant instant-or-millis))))
+
 (defsqldate java.sql.Time sql-time jt.l/local-time 3
   "Creates a `java.sql.Time` out of any combination of arguments valid for
-  `java-time/local-time` (except the nanos constructor) or the LocalTime
+  `java-time/local-time` (except the nanos constructor) or the `LocalTime`
   itself.
 
   Please consider using the JSR-310 Java Time types instead of `java.sql.Time`

test/java_time_test.clj

@@ -676,13 +676,18 @@
     (is (= (java.sql.Timestamp/valueOf (j/local-date-time 2000 10 5 20 30 40))
            (j/sql-timestamp 2000 10 5 20 30 40)
            (j/sql-timestamp (j/local-date-time 2000 10 5 20 30 40))))
+    (is (= (java.sql.Timestamp/from (j/instant 1))
+           (java.sql.Timestamp. 1)
+           (j/instant->sql-timestamp (j/instant 1))
+           (j/instant->sql-timestamp 1)))
     (is (= (java.sql.Time/valueOf (j/local-time 20 30 40))
            (j/sql-time 20 30 40)
            (j/sql-time (j/local-time 20 30 40))))
 
     (is (= (j/local-date 2000 10 5) (j/local-date (j/sql-date 2000 10 5))))
     (is (= (j/local-date-time 2000 10 5 20 30 40 1000)
            (j/local-date-time (j/sql-timestamp 2000 10 5 20 30 40 1000))))
+    (is (= (j/instant 1) (j/instant (j/instant->sql-timestamp 1))))
     (is (= (j/local-time 20 30 40) (j/local-time (j/sql-time 20 30 40)))))
 
   (testing "from java.util Date types"