diff options
| -rw-r--r-- | src/main/scala/xyz/driver/core/config.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/database/Dal.scala | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/config.scala b/src/main/scala/xyz/driver/core/config.scala index 112986e..be81408 100644 --- a/src/main/scala/xyz/driver/core/config.scala +++ b/src/main/scala/xyz/driver/core/config.scala @@ -8,7 +8,7 @@ object config { def loadDefaultConfig: Config = { val configDefaults = ConfigFactory.load(this.getClass.getClassLoader, "application.conf") - scala.sys.props.get("application.config") match { + scala.sys.env.get("APPLICATION_CONFIG").orElse(scala.sys.props.get("application.config")) match { case Some(filename) => val configFile = new File(filename) diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala index 0d38282..d863e50 100644 --- a/src/main/scala/xyz/driver/core/database/Dal.scala +++ b/src/main/scala/xyz/driver/core/database/Dal.scala @@ -1,7 +1,8 @@ package xyz.driver.core.database -import scala.concurrent.{ExecutionContext, Future} +import slick.lifted.AbstractTable +import scala.concurrent.{ExecutionContext, Future} import scalaz.{ListT, Monad} import scalaz.std.scalaFuture._ @@ -44,4 +45,13 @@ class SlickDal(database: Database, executionContext: ExecutionContext) extends D override def noAction[V](v: V): T[V] = DBIO.successful(v) override def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) + + def affectsRows(updatesCount: Int): Option[Unit] = { + if (updatesCount > 0) Some(()) else None + } + + def insertReturning[AT <: AbstractTable[_], V](table: TableQuery[AT])( + row: AT#TableElementType): slick.dbio.DBIO[AT#TableElementType] = { + table.returning(table) += row + } } |