diff options
author | vlad <vlad@driver.xyz> | 2017-08-07 14:34:07 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-08-07 14:34:07 -0700 |
commit | 2283b61115fc94029f4772e2fbd05eaabb2ad5a8 (patch) | |
tree | ad2c4bf5bc1295d1318baea92ac34443803009a8 /src/main/scala/xyz/driver/core/database/database.scala | |
parent | a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8 (diff) | |
parent | 886415aa5f86e758d9a9aafa8f60128e3473311a (diff) | |
download | driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.gz driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.bz2 driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/scala/xyz/driver/core/database/database.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/database.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala index 8426309..7855a16 100644 --- a/src/main/scala/xyz/driver/core/database/database.scala +++ b/src/main/scala/xyz/driver/core/database/database.scala @@ -1,7 +1,7 @@ package xyz.driver.core -import slick.backend.DatabaseConfig -import slick.driver.JdbcProfile +import slick.basic.DatabaseConfig +import slick.jdbc.JdbcProfile import xyz.driver.core.date.Date import xyz.driver.core.time.Time @@ -21,7 +21,7 @@ package database { val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName, config) new Database { - val profile: JdbcProfile = dbConfig.driver + val profile: JdbcProfile = dbConfig.profile val database: JdbcProfile#Backend#Database = dbConfig.db } } |