fix Time#toDate and sqlDateToDate

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index 7d9aecb..c88260b 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -3,7 +3,7 @@ package xyz.driver.core
 import java.sql.{Date => SqlDate}
 import java.util.Calendar
 
-import date.{Date, javaDateToDate}
+import date.Date
 import slick.dbio.{DBIOAction, NoStream}
 
 package object database {
@@ -13,7 +13,13 @@ package object database {
     def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
   }
 
-  private[database] def sqlDateToDate(date: SqlDate): Date = javaDateToDate(date)
+  private[database] def sqlDateToDate(sqlDate: SqlDate): Date = {
+    // NOTE: SQL date does not have a time component, so this date
+    // should only be interpreted in the running JVMs timezone.
+    val cal = Calendar.getInstance()
+    cal.setTime(sqlDate)
+    Date(cal.get(Calendar.YEAR), date.tagMonth(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH))
+  }
 
   private[database] def dateToSqlDate(date: Date): SqlDate = {
     val cal = Calendar.getInstance()