diff options
| author | vlad <vlad@driver.xyz> | 2017-03-20 18:55:58 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-03-20 18:55:58 -0700 |
| commit | dcceb9aae8073617f43335c83647af5ccf8685ef (patch) | |
| tree | e055c0556a58614588473b862b9f315f945e8163 /src/main/scala/xyz/driver/core/database/package.scala | |
| parent | 7f03501bf652214a4a8d12f62764f73257714d7e (diff) | |
| parent | 5b96449bfcb9117c755e1b48a8462f79d6e1230c (diff) | |
| download | driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.tar.gz driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.tar.bz2 driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.zip | |
Merge remote-tracking branch 'origin/master' into master3v0.10.31
Diffstat (limited to 'src/main/scala/xyz/driver/core/database/package.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/database/package.scala | 4 |
1 files changed, 2 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 32b240e..791a688 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 +import date.{Date, Month} import slick.dbio.{DBIOAction, NoStream} package object database { @@ -18,7 +18,7 @@ package object database { // 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)) + Date(cal.get(Calendar.YEAR), Month(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH)) } private[database] def dateToSqlDate(date: Date): SqlDate = { |