nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated slick to avoid crashes at startup

Browse source
This commit is contained in:
Felix Ableitner 2016-09-22 09:42:54 +09:00
parent c4ee46c038
commit e9da8cd1f5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/build.gradle
View file

@ -3,7 +3,7 @@ apply plugin: 'scala'
dependencies { dependencies {
compile 'org.scala-lang:scala-library:2.11.7' compile 'org.scala-lang:scala-library:2.11.7'
compile 'com.h2database:h2:1.4.192' 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 'com.typesafe.scala-logging:scala-logging_2.11:3.5.0'
compile 'joda-time:joda-time:2.9.4' compile 'joda-time:joda-time:2.9.4'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

8
core/src/main/scala/com/nutomic/ensichat/core/util/Database.scala
View file

@ -11,7 +11,7 @@ import com.nutomic.ensichat.core.routing.Address
import com.typesafe.scalalogging.Logger import com.typesafe.scalalogging.Logger
import org.joda.time import org.joda.time
import org.joda.time.DateTime import org.joda.time.DateTime
import slick.driver.H2Driver.api._ import slick.jdbc.H2Profile.api._
import scala.concurrent.Await import scala.concurrent.Await
import scala.concurrent.duration.Duration import scala.concurrent.duration.Duration
@ -40,7 +40,7 @@ class Database(path: File, settings: SettingsInterface, callbackInterface: Callb
def date = column[Long]("date") def date = column[Long]("date")
def tokens = column[Int]("tokens") def tokens = column[Int]("tokens")
def confirmedDelivered = column[Boolean]("confirmed_delivered") 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 => tuple =>
val header = new ContentHeader(new Address(tuple._1), val header = new ContentHeader(new Address(tuple._1),
new Address(tuple._2), new Address(tuple._2),
@ -63,7 +63,7 @@ class Database(path: File, settings: SettingsInterface, callbackInterface: Callb
def address = column[String]("address", O.PrimaryKey) def address = column[String]("address", O.PrimaryKey)
def name = column[String]("name") def name = column[String]("name")
def status = column[String]("status") 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) def * = (wrappedAddress, name, status) <> (User.tupled, User.unapply)
} }
private val contacts = TableQuery[Contacts] 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") { private class KnownDevices(tag: Tag) extends Table[(Address, time.Duration)](tag, "KNOWN_DEVICES") {
def address = column[String]("address", O.PrimaryKey) def address = column[String]("address", O.PrimaryKey)
def totalConnectionSeconds = column[Long]("total_connection_seconds") 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 => (new Address(tuple._1), time.Duration.standardSeconds(tuple._2)),
tuple => Option((tuple._1.toString, tuple._2.getStandardSeconds))) tuple => Option((tuple._1.toString, tuple._2.getStandardSeconds)))
} }