aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-08-07 14:41:43 -0700
committervlad <vlad@driver.xyz>2017-08-07 14:41:43 -0700
commit4c40344fef816ad42c5e8da8ebd73c54f268c02b (patch)
tree31c46a8853684d3289209de6cd6562d7bffc1921
parentf9f3f85602cdfd47226c902a2c8311d73791d1fb (diff)
downloaddriver-core-4c40344fef816ad42c5e8da8ebd73c54f268c02b.tar.gz
driver-core-4c40344fef816ad42c5e8da8ebd73c54f268c02b.tar.bz2
driver-core-4c40344fef816ad42c5e8da8ebd73c54f268c02b.zip
Rollback Slick to 3.1.1
-rw-r--r--src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala6
-rw-r--r--src/main/scala/xyz/driver/core/database/database.scala6
-rw-r--r--src/main/scala/xyz/driver/core/database/package.scala2
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 a3f57c1..1331efc 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.jdbc.HsqldbProfile
+import slick.driver.HsqldbDriver
import slick.jdbc.JdbcType
import slick.ast.FieldSymbol
-import slick.relational.RelationalProfile
+import slick.profile.RelationalProfile
-trait PatchedHsqldbProfile extends HsqldbProfile {
+trait PatchedHsqldbProfile extends HsqldbDriver {
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 7855a16..8426309 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.basic.DatabaseConfig
-import slick.jdbc.JdbcProfile
+import slick.backend.DatabaseConfig
+import slick.driver.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.profile
+ val profile: JdbcProfile = dbConfig.driver
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 9385c8f..b39169d 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.jdbc.JdbcProfile
+import slick.driver.JdbcProfile
package object database {