diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-06-27 15:49:21 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-08-02 12:55:24 -0700 |
| commit | f1328134ada77d1c21374f7cca953a376a9b27f9 (patch) | |
| tree | c1cd78d7d59abd29185fa061309a3d9ca6cdf8fc /src/main/scala/xyz/driver/core/database | |
| parent | 59655964902b3c75e8e1f06e2f7d2cf038126fb3 (diff) | |
| download | driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.gz driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.bz2 driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.zip | |
Library upgrades and code tweaks to support Scala 2.12v0.15.0
Diffstat (limited to 'src/main/scala/xyz/driver/core/database')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala index 1331efc..a3f57c1 100644 --- a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala +++ b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala @@ -1,11 +1,11 @@ package xyz.driver.core.database -import slick.driver.HsqldbDriver +import slick.jdbc.HsqldbProfile import slick.jdbc.JdbcType import slick.ast.FieldSymbol -import slick.profile.RelationalProfile +import slick.relational.RelationalProfile -trait PatchedHsqldbProfile extends HsqldbDriver { +trait PatchedHsqldbProfile extends HsqldbProfile { override def defaultSqlTypeName(tmd: JdbcType[_], sym: Option[FieldSymbol]): String = tmd.sqlType match { case java.sql.Types.VARCHAR => val size = sym.flatMap(_.findColumnOption[RelationalProfile.ColumnOption.Length]) 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 } } diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala index b39169d..9385c8f 100644 --- a/src/main/scala/xyz/driver/core/database/package.scala +++ b/src/main/scala/xyz/driver/core/database/package.scala @@ -5,7 +5,7 @@ import java.util.Calendar import date.{Date, Month} import slick.dbio._ -import slick.driver.JdbcProfile +import slick.jdbc.JdbcProfile package object database { |