SEC-68 : Work around Scala 2.12 regression bug

scala/bug#10477
Opetushallitus · Apr 8, 2019 · cfd7de8 · cfd7de8
1 parent 01db809
commit cfd7de8
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/scala/fi/vm/sade/hakurekisteri/rest/support/HakurekisteriDriver.scala b/src/main/scala/fi/vm/sade/hakurekisteri/rest/support/HakurekisteriDriver.scala
@@ -5,10 +5,18 @@ import java.util.UUID
 
 import com.github.nscala_time.time.Imports._
 import slick.ast.{FieldSymbol, Node}
-import slick.jdbc.{JdbcStatementBuilderComponent, PostgresProfile}
+import slick.jdbc.{JdbcBackend, JdbcStatementBuilderComponent, PostgresProfile}
 
-object HakurekisteriDriver extends PostgresProfile {
+trait HakurekisteriDriver extends PostgresProfile {
+  override val backend: JdbcBackend
+  override val api: API with HakurekisteriColumns = new API with HakurekisteriColumns {
+    override implicit lazy val uuidColumnType: columnTypes.UUIDJdbcType = columnTypes.uuidJdbcType
+  }
+}
 
+class HakurekisteriDriver1 extends HakurekisteriDriver
+
+object HakurekisteriDriver extends HakurekisteriDriver1 {
   override val columnTypes: HakurekisteriDriver.JdbcTypes = new super.JdbcTypes {
     override val uuidJdbcType: UUIDJdbcType = new UUIDJdbcType {
       override def sqlTypeName(sym: Option[FieldSymbol]): String = "VARCHAR"
@@ -19,9 +27,6 @@ object HakurekisteriDriver extends PostgresProfile {
       override def hasLiteralForm = true
     }
   }
-  override val api: HakurekisteriDriver.API with HakurekisteriColumns = new API with HakurekisteriColumns {
-    override implicit lazy val uuidColumnType: columnTypes.UUIDJdbcType = columnTypes.uuidJdbcType
-  }
 
   import api._