From e9da8cd1f55953503da141111ff838a738984720 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 22 Sep 2016 09:42:54 +0900
Subject: [PATCH] Updated slick to avoid crashes at startup

---
 core/build.gradle                                         | 2 +-
 .../scala/com/nutomic/ensichat/core/util/Database.scala   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 65270ff..00b083f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'scala'
 dependencies {
     compile 'org.scala-lang:scala-library:2.11.7'
     compile 'com.h2database:h2:1.4.192'
-    compile 'com.typesafe.slick:slick_2.11:3.1.1'
+    compile 'com.typesafe.slick:slick_2.11:3.2.0-M1'
     compile 'com.typesafe.scala-logging:scala-logging_2.11:3.5.0'
     compile 'joda-time:joda-time:2.9.4'
     testCompile 'junit:junit:4.12'
diff --git a/core/src/main/scala/com/nutomic/ensichat/core/util/Database.scala b/core/src/main/scala/com/nutomic/ensichat/core/util/Database.scala
index 04092e8..7e5775c 100644
--- a/core/src/main/scala/com/nutomic/ensichat/core/util/Database.scala
+++ b/core/src/main/scala/com/nutomic/ensichat/core/util/Database.scala
@@ -11,7 +11,7 @@ import com.nutomic.ensichat.core.routing.Address
 import com.typesafe.scalalogging.Logger
 import org.joda.time
 import org.joda.time.DateTime
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
@@ -40,7 +40,7 @@ class Database(path: File, settings: SettingsInterface, callbackInterface: Callb
     def date                = column[Long]("date")
     def tokens              = column[Int]("tokens")
     def confirmedDelivered  = column[Boolean]("confirmed_delivered")
-    def * = (origin, target, messageId, text, date, tokens, confirmedDelivered) <> [(Message, Boolean), (String, String, Long, String, Long, Int, Boolean)]( {
+    def * = (origin, target, messageId, text, date, tokens, confirmedDelivered) <> [(Message, Boolean)]( {
       tuple =>
         val header = new ContentHeader(new Address(tuple._1),
           new Address(tuple._2),
@@ -63,7 +63,7 @@ class Database(path: File, settings: SettingsInterface, callbackInterface: Callb
     def address = column[String]("address", O.PrimaryKey)
     def name    = column[String]("name")
     def status  = column[String]("status")
-    def wrappedAddress = address <> [Address, String](new Address(_), a => Option(a.toString))
+    def wrappedAddress = address <> [Address](new Address(_), a => Option(a.toString))
     def * = (wrappedAddress, name, status) <> (User.tupled, User.unapply)
   }
   private val contacts = TableQuery[Contacts]
@@ -71,7 +71,7 @@ class Database(path: File, settings: SettingsInterface, callbackInterface: Callb
   private class KnownDevices(tag: Tag) extends Table[(Address, time.Duration)](tag, "KNOWN_DEVICES") {
     def address                 = column[String]("address", O.PrimaryKey)
     def totalConnectionSeconds  = column[Long]("total_connection_seconds")
-    def * = (address, totalConnectionSeconds) <> [(Address, time.Duration), (String, Long)](
+    def * = (address, totalConnectionSeconds) <> [(Address, time.Duration)](
       tuple => (new Address(tuple._1), time.Duration.standardSeconds(tuple._2)),
       tuple => Option((tuple._1.toString, tuple._2.getStandardSeconds)))
   }