diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-19 12:32:18 -0500 |
---|---|---|
committer | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-19 12:32:18 -0500 |
commit | 8515d672a9fdbb0eb9038a96cee661828cafa61a (patch) | |
tree | 3f04b773de6cea3def3566d2ca4bdff9b78ace8b /src/main/scala/com/drivergrp/core/database.scala | |
parent | 1702e1c44c45e36e2d6d289ef1b7d703f65ec422 (diff) | |
parent | 861ceb03e8faeb564dd027b13250b5604af8645f (diff) | |
download | driver-core-8515d672a9fdbb0eb9038a96cee661828cafa61a.tar.gz driver-core-8515d672a9fdbb0eb9038a96cee661828cafa61a.tar.bz2 driver-core-8515d672a9fdbb0eb9038a96cee661828cafa61a.zip |
Merge branch 'master' into implicit-companions
Diffstat (limited to 'src/main/scala/com/drivergrp/core/database.scala')
-rw-r--r-- | src/main/scala/com/drivergrp/core/database.scala | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/main/scala/com/drivergrp/core/database.scala b/src/main/scala/com/drivergrp/core/database.scala deleted file mode 100644 index 581c5de..0000000 --- a/src/main/scala/com/drivergrp/core/database.scala +++ /dev/null @@ -1,52 +0,0 @@ -package com.drivergrp.core - -import com.drivergrp.core.time.Time - -import scala.concurrent.Future -import slick.backend.DatabaseConfig -import slick.driver.JdbcProfile - -object database { - - trait Database { - val profile: JdbcProfile - val database: JdbcProfile#Backend#Database - } - - object Database { - - def fromConfig(databaseName: String): Database = { - val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName) - - new Database { - val profile: JdbcProfile = dbConfig.driver - val database: JdbcProfile#Backend#Database = dbConfig.db - } - } - } - - trait IdColumnTypes { - val database: Database - - import database.profile.api._ - - implicit def idColumnType[T] = - MappedColumnType.base[Id[T], Long](id => id: Long, Id[T](_)) - - implicit def nameColumnType[T] = - MappedColumnType.base[Name[T], String](name => name: String, Name[T](_)) - - implicit val timeColumnType = MappedColumnType.base[Time, Long](time => time.millis, Time(_)) - } - - trait DatabaseObject extends IdColumnTypes { - - def createTables(): Future[Unit] - def disconnect(): Unit - } - - abstract class DatabaseObjectAdapter extends DatabaseObject { - def createTables(): Future[Unit] = Future.successful(()) - def disconnect(): Unit = {} - } -} |