diff options
author | vlad <vlad@drivergrp.com> | 2016-11-29 15:27:17 -0800 |
---|---|---|
committer | vlad <vlad@drivergrp.com> | 2016-11-29 15:27:17 -0800 |
commit | f6eb2f6d310f76e0ea0e2fba9b70039ba6b62557 (patch) | |
tree | 9fc83206848eb49299d4c98031a8c23eef901492 /src/main/scala/xyz/driver | |
parent | 735cf82d32c9f14ce4eeb97bcc1538854fc4207f (diff) | |
download | driver-core-f6eb2f6d310f76e0ea0e2fba9b70039ba6b62557.tar.gz driver-core-f6eb2f6d310f76e0ea0e2fba9b70039ba6b62557.tar.bz2 driver-core-f6eb2f6d310f76e0ea0e2fba9b70039ba6b62557.zip |
Merge branch 'master' of https://github.com/drivergroup/driver-core into string-ids
# Conflicts:
# src/main/scala/xyz/driver/core/database.scala
Diffstat (limited to 'src/main/scala/xyz/driver')
-rw-r--r-- | src/main/scala/xyz/driver/core/database.scala | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database.scala index 4af81f3..6426e27 100644 --- a/src/main/scala/xyz/driver/core/database.scala +++ b/src/main/scala/xyz/driver/core/database.scala @@ -37,31 +37,19 @@ object database { import database.profile.api._ implicit def `xyz.driver.core.Id.columnType`[T] = - MappedColumnType.base[Id[T], Long](id => id: Long, Id[T](_)) + MappedColumnType.base[Id[T], String](_.value, Id[T](_)) implicit def `xyz.driver.core.Name.columnType`[T] = - MappedColumnType.base[Name[T], String](name => name: String, Name[T](_)) + MappedColumnType.base[Name[T], String](_.value, Name[T](_)) implicit def `xyz.driver.core.time.Time.columnType` = - MappedColumnType.base[Time, Long](time => time.millis, Time(_)) + MappedColumnType.base[Time, Long](_.millis, Time(_)) } trait DatabaseObject extends ColumnTypes { -// implicit val exec: ExecutionContext - def createTables(): Future[Unit] def disconnect(): Unit - -// def ensureTableExist(schemas: Seq[Schema]): Future[Unit] = -// for { -// dropping <- Future.sequence(schemas.map { schema => -// database.database.run(schema.drop).recover { case _: Throwable => () } -// }) -// creation <- Future.sequence(schemas.map { schema => -// database.database.run(schema.create).recover { case _: Throwable => () } -// }) -// } yield () } abstract class DatabaseObjectAdapter extends DatabaseObject { |