Bumped Slick to version 3.6.1 and Play-slick to version 5.4.0

.github/workflows/scala.yml

@@ -12,7 +12,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - scala-version: 2.12.x
         - scala-version: 2.13.x
     steps:
     - uses: actions/checkout@v2

build.sbt

@@ -16,6 +16,7 @@ val `unicorn-core` = project
   .settings(Settings.core *)
   .settings(
     libraryDependencies ++= Dependencies.core,
+    libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
     // cannot be higher due to tests not able to reproduce abnormal DB behavior
     coverageMinimum := 100,
     Test / scalastyleConfig := file("scalastyle-test-config.xml"),

project/Dependencies.scala

@@ -3,7 +3,7 @@ import sbt._
 object Dependencies {
 
   val mainCore: Seq[ModuleID] = Seq(
-    "com.typesafe.slick" %% "slick" % "3.4.1",
+    "com.typesafe.slick" %% "slick" % "3.6.1",
     "joda-time" % "joda-time" % "2.14.0",
     "org.joda" % "joda-convert" % "3.0.1"
   )
@@ -17,12 +17,12 @@ object Dependencies {
   val core: Seq[ModuleID] = mainCore ++ testCore
 
   val mainPlay: Seq[ModuleID] = Seq(
-    "com.typesafe.play" %% "play-slick" % "5.1.0"
+    "com.typesafe.play" %% "play-slick" % "5.4.0"
   )
 
   val testPlay: Seq[ModuleID] = Seq(
-    "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
-    "com.typesafe.play" %% "play-test" % "2.8.20" % "test"
+    "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.2" % Test,
+    "com.typesafe.play" %% "play-test" % "2.9.8" % "test"
   )
 
   val play: Seq[ModuleID] = mainPlay ++ testPlay

project/Settings.scala

@@ -4,7 +4,6 @@ import sbtrelease.ReleasePlugin.autoImport._
 
 object Settings {
 
-  val scala_2_12 = "2.12.20"
   val scala_2_13 = "2.13.16"
 
   val alsoOnTest = "compile->compile;test->test"
@@ -13,7 +12,7 @@ object Settings {
   val common = Seq(
     organization := "org.virtuslab",
     scalaVersion := scala_2_13,
-    crossScalaVersions := Seq(scala_2_12, scala_2_13),
+    crossScalaVersions := Seq(scala_2_13),
     releaseCrossBuild := true,
 
     Test / fork := true,

unicorn-core/src/main/scala/org/virtuslab/unicorn/Identifiers.scala

@@ -1,7 +1,5 @@
 package org.virtuslab.unicorn
 
-import slick.lifted.MappedTo
-
 /**
  * Base trait for implementing ids.
  * It is existential trait so it can have only defs.

unicorn-core/src/main/scala/org/virtuslab/unicorn/IsomorphicColumnTypeConversion.scala

@@ -0,0 +1,11 @@
+package org.virtuslab.unicorn
+
+import slick.jdbc.JdbcProfile
+
+import scala.reflect.ClassTag
+
+class IsomorphicColumnTypeConversion(implicit val profile: JdbcProfile) {
+  import profile._
+  implicit def isomorphicType[A, B](implicit iso: Isomorphism[A, B], ct: ClassTag[A], jt: BaseColumnType[B]): BaseColumnType[A] =
+    MappedColumnType.base[A, B](iso.map, iso.comap)
+}

unicorn-core/src/main/scala/org/virtuslab/unicorn/MappedTo.scala

@@ -0,0 +1,54 @@
+package org.virtuslab.unicorn
+
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox.Context
+import scala.util.control.NonFatal
+
+/** An isomorphism between two types that can be used for mapped column types. */
+class Isomorphism[A, B](val map: A => B, val comap: B => A)
+
+trait MappedToBase extends Any {
+  type Underlying
+  def value: Underlying
+}
+
+object MappedToBase {
+  implicit def mappedToIsomorphism[E <: MappedToBase]: Isomorphism[E, E#Underlying] = macro mappedToIsomorphismMacroImpl[E]
+
+  def mappedToIsomorphismMacroImpl[E <: MappedToBase](c: Context)(implicit e: c.WeakTypeTag[E]): c.Expr[Isomorphism[E, E#Underlying]] = {
+    import c.universe._
+    // Check that E <: MappedToBase. Due to SI-8351 the macro can be expanded before scalac has
+    // checked this. The error message here will never be seen because scalac's subsequent bounds
+    // check fails, overriding our error (or backtracking in implicit search).
+    if (!(e.tpe <:< c.typeOf[MappedToBase]))
+      c.abort(c.enclosingPosition, "Work-around for SI-8351 leading to illegal macro-invocation -- You should not see this message")
+    implicit val eutag = c.TypeTag[E#Underlying](e.tpe.member(TypeName("Underlying")).typeSignatureIn(e.tpe))
+    val cons = c.Expr[E#Underlying => E](Function(
+      List(ValDef(Modifiers(Flag.PARAM), TermName("v"), /*Ident(eu.tpe.typeSymbol)*/ TypeTree(), EmptyTree)),
+      Apply(
+        Select(New(TypeTree(e.tpe)), termNames.CONSTRUCTOR),
+        List(Ident(TermName("v"))))))
+    val res = reify { new Isomorphism[E, E#Underlying](_.value, cons.splice) }
+    try c.typecheck(res.tree) catch {
+      case NonFatal(ex) =>
+        val p = c.enclosingPosition
+        val msg = "Error typechecking MappedTo expansion: " + ex.getMessage
+        println(p.source.path + ":" + p.line + ": " + msg)
+        c.error(c.enclosingPosition, msg)
+    }
+    res
+  }
+}
+
+/**
+ * The base type for automatically mapped column types.
+ * Extending this type (with a type parameter ``T`` which is already a
+ * supported column type) lets you use your custom type as a column
+ * type in the Lifted Embedding. You must provide a constructor that
+ * takes a single value of the underlying type (same restriction as
+ * for value classes).
+ */
+trait MappedTo[T] extends Any with MappedToBase {
+  type Underlying = T
+  def value: T
+}

unicorn-core/src/test/scala/org/virtuslab/unicorn/BaseTest.scala

@@ -23,7 +23,7 @@ trait BaseTest[Underlying] extends AnyFlatSpecLike with Matchers with BeforeAndA
 
   val dbDriver = "org.h2.Driver"
 
-  lazy val DB: unicorn.profile.backend.DatabaseDef = unicorn.profile.backend.Database.forURL(dbURL, driver = dbDriver)
+  lazy val DB: unicorn.profile.backend.JdbcDatabaseDef = unicorn.profile.backend.Database.forURL(dbURL, driver = dbDriver)
 
   implicit val defaultPatience: PatienceConfig =
     PatienceConfig(timeout = Span(5, Seconds), interval = Span(500, Millis))

unicorn-core/src/test/scala/org/virtuslab/unicorn/repositories/AlternativeIDTest.scala

@@ -30,7 +30,10 @@ trait UUIDTable extends UUIDTestUnicorn {
 
   import unicorn._
 
-  case class UniqueUserId(id: UUID) extends BaseId[UUID]
+  val ictc = new IsomorphicColumnTypeConversion
+  import ictc._
+
+  case class UniqueUserId(id: UUID) extends BaseId[UUID] with MappedToBase
 
   case class PersonRow(id: Option[UniqueUserId], name: String) extends WithId[UUID, UniqueUserId]
 

unicorn-core/src/test/scala/org/virtuslab/unicorn/repositories/JunctionRepositoryTest.scala

@@ -2,21 +2,24 @@ package org.virtuslab.unicorn.repositories
 
 import org.virtuslab.unicorn.LongUnicornIdentifiers.IdCompanion
 import org.virtuslab.unicorn.TestUnicorn.profile.api._
-import org.virtuslab.unicorn.{ BaseId, BaseTest, LongTestUnicorn }
+import org.virtuslab.unicorn.{ BaseId, BaseTest, IsomorphicColumnTypeConversion, LongTestUnicorn, MappedToBase }
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
 class JunctionRepositoryTest extends BaseTest[Long] with LongTestUnicorn {
 
   import unicorn._
 
+  val ictc = new IsomorphicColumnTypeConversion
+  import ictc._
+
   behavior of classOf[JunctionRepository[_, _, _]].getSimpleName
 
-  case class OrderId(id: Long) extends BaseId[Long]
+  case class OrderId(id: Long) extends BaseId[Long] with MappedToBase
 
   object OrderId extends IdCompanion[OrderId]
 
-  case class CustomerId(id: Long) extends BaseId[Long]
+  case class CustomerId(id: Long) extends BaseId[Long] with MappedToBase
 
   object CustomerId extends IdCompanion[CustomerId]
 

unicorn-core/src/test/scala/org/virtuslab/unicorn/repositories/UsersRepositoryTest.scala

@@ -16,7 +16,10 @@ trait AbstractUserTable {
   import unicorn.profile.api._
   import identifiers._
 
-  case class UserId(id: Long) extends BaseId[Long]
+  val ictc = new IsomorphicColumnTypeConversion
+  import ictc._
+
+  case class UserId(id: Long) extends BaseId[Long] with MappedToBase
 
   object UserId extends CoreCompanion[UserId]
 

unicorn-play/src/main/scala/org/virtuslab/unicorn/UnicornPlay.scala

@@ -20,7 +20,7 @@ abstract class UnicornPlayLike[Underlying](dbConfig: DatabaseConfig[JdbcProfile]
 
   val profile: JdbcProfile = dbConfig.profile
 
-  val db: JdbcBackend#DatabaseDef = dbConfig.db
+  val db: JdbcBackend#Database = dbConfig.db
 }
 
 abstract class UnicornPlay[Underlying](dbConfig: DatabaseConfig[JdbcProfile])

unicorn-play/src/test/scala/org/virtuslab/unicorn/StringPlayUnicorn.scala

@@ -16,7 +16,7 @@ object StringUnicornPlayIdentifiers extends PlayIdentifiersImpl[String] {
 
 import StringUnicornPlayIdentifiers._
 
-case class UserId(id: String) extends BaseId[String]
+case class UserId(id: String) extends BaseId[String] with MappedToBase
 
 object UserId extends IdCompanion[UserId]
 
@@ -28,6 +28,9 @@ trait UserQuery {
   import unicorn._
   import unicorn.profile.api._
 
+  val ictc = new IsomorphicColumnTypeConversion
+  import ictc._
+
   class UserTable(tag: SlickTag) extends IdTable[UserId, UserRow](tag, "test") {
     def name = column[String]("name")
     override def * : ProvenShape[UserRow] = (id.?, name) <> (UserRow.tupled, UserRow.unapply)