aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/com/drivergrp/core/database.scala
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-07-18 18:00:26 -0400
committervlad <vlad@drivergrp.com>2016-07-18 18:00:26 -0400
commitc2bf3f05366b37a0de47a000c171910fa0965d58 (patch)
tree0dc41038af60889b047636fe6e4e3ae02a0186c7 /src/main/scala/com/drivergrp/core/database.scala
parent87e6769bbb51bdd9aff4b7c35e09283f1f71d45e (diff)
downloaddriver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.tar.gz
driver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.tar.bz2
driver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.zip
Added scalafmt to core
Diffstat (limited to 'src/main/scala/com/drivergrp/core/database.scala')
-rw-r--r--src/main/scala/com/drivergrp/core/database.scala11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/scala/com/drivergrp/core/database.scala b/src/main/scala/com/drivergrp/core/database.scala
index b23c953..beabbff 100644
--- a/src/main/scala/com/drivergrp/core/database.scala
+++ b/src/main/scala/com/drivergrp/core/database.scala
@@ -4,7 +4,6 @@ import scala.concurrent.Future
import slick.backend.DatabaseConfig
import slick.driver.JdbcProfile
-
object database {
trait Database {
@@ -18,26 +17,24 @@ object database {
val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName)
new Database {
- val profile: JdbcProfile = dbConfig.driver
+ 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 => Id[T](id) })
+ MappedColumnType.base[Id[T], Long](id => id: Long, Id[T](_))
implicit def nameColumnType[T] =
- MappedColumnType.base[Name[T], String]({ name => name: String }, { name => Name[T](name) })
+ MappedColumnType.base[Name[T], String](name => name: String, Name[T](_))
}
-
trait DatabaseObject extends IdColumnTypes {
def createTables(): Future[Unit]
@@ -46,6 +43,6 @@ object database {
abstract class DatabaseObjectAdapter extends DatabaseObject {
def createTables(): Future[Unit] = Future.successful(())
- def disconnect(): Unit = {}
+ def disconnect(): Unit = {}
}
}