diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-19 19:07:31 -0500 |
---|---|---|
committer | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-19 19:13:56 -0500 |
commit | 548338adc1691ea667f7941bfc65f8a6d6ce2c0e (patch) | |
tree | af3a1d3e5a6a5a30708086a4b9a33240c76fa47d /src | |
parent | d63fd7ef92b67dec5ea72f26d73d56cec676bd82 (diff) | |
download | driver-core-548338adc1691ea667f7941bfc65f8a6d6ce2c0e.tar.gz driver-core-548338adc1691ea667f7941bfc65f8a6d6ce2c0e.tar.bz2 driver-core-548338adc1691ea667f7941bfc65f8a6d6ce2c0e.zip |
add timezone to time => date conversion
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/package.scala | 1 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/generators.scala | 2 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/time.scala | 6 |
3 files changed, 7 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 2041b85..7d9aecb 100644 --- a/src/main/scala/xyz/driver/core/database/package.scala +++ b/src/main/scala/xyz/driver/core/database/package.scala @@ -7,6 +7,7 @@ import date.{Date, javaDateToDate} import slick.dbio.{DBIOAction, NoStream} package object database { + type Schema = { def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] diff --git a/src/main/scala/xyz/driver/core/generators.scala b/src/main/scala/xyz/driver/core/generators.scala index 0db18a1..d532ae3 100644 --- a/src/main/scala/xyz/driver/core/generators.scala +++ b/src/main/scala/xyz/driver/core/generators.scala @@ -56,7 +56,7 @@ object generators { Time(scala.math.max(oneTime.millis, anotherTime.millis))) } - def nextDate(): Date = nextTime.toDate + def nextDate(): Date = nextTime.toDate(java.util.TimeZone.getTimeZone("UTC")) def nextBigDecimal(multiplier: Double = 1000000.00, precision: Int = 2): BigDecimal = BigDecimal(multiplier * nextDouble, new MathContext(precision)) diff --git a/src/main/scala/xyz/driver/core/time.scala b/src/main/scala/xyz/driver/core/time.scala index 6d76939..cdeb3a6 100644 --- a/src/main/scala/xyz/driver/core/time.scala +++ b/src/main/scala/xyz/driver/core/time.scala @@ -27,7 +27,11 @@ object time { def advanceBy(duration: Duration): Time = Time(millis + duration.toMillis) - def toDate: date.Date = date.javaDateToDate(new java.util.Date(millis)) + def toDate(timezone: TimeZone): date.Date = { + val cal = java.util.Calendar.getInstance(timezone) + cal.setTimeInMillis(millis) + date.javaDateToDate(cal.getTime()) + } } final case class TimeRange(start: Time, end: Time) { |