From e216e81c05331c671aa7e34e04c54de1b96075a8 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Thu, 19 Jan 2017 17:05:48 -0800 Subject: Fix bug in database timestamp column mapper --- src/main/scala/xyz/driver/core/database/database.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/core') diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala index a8aec63..c4cf180 100644 --- a/src/main/scala/xyz/driver/core/database/database.scala +++ b/src/main/scala/xyz/driver/core/database/database.scala @@ -36,7 +36,8 @@ package database { MappedColumnType.base[Name[T], String](_.value, Name[T](_)) implicit def `xyz.driver.core.time.Time.columnType`: BaseColumnType[Time] = - MappedColumnType.base[Time, Long](_.millis, Time(_)) + MappedColumnType.base[Time, java.sql.Timestamp](time => new java.sql.Timestamp(time.millis), + timestamp => Time(timestamp.getTime)) implicit def `xyz.driver.core.time.Date.columnType`: BaseColumnType[Date] = MappedColumnType.base[Date, java.sql.Date](dateToSqlDate(_), sqlDateToDate(_)) -- cgit v1.2.3