Skip to content

Commit f7aca46

Browse files
committed
Fixed compilation errors after the dependency upgrade.
1 parent fbbd64d commit f7aca46

6 files changed

Lines changed: 20 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait BaseTest[Underlying] extends AnyFlatSpecLike with Matchers with BeforeAndA
2323

2424
val dbDriver = "org.h2.Driver"
2525

26-
lazy val DB: unicorn.profile.backend.DatabaseDef = unicorn.profile.backend.Database.forURL(dbURL, driver = dbDriver)
26+
lazy val DB: unicorn.profile.backend.JdbcDatabaseDef = unicorn.profile.backend.Database.forURL(dbURL, driver = dbDriver)
2727

2828
implicit val defaultPatience: PatienceConfig =
2929
PatienceConfig(timeout = Span(5, Seconds), interval = Span(500, Millis))

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ trait UUIDTable extends UUIDTestUnicorn {
3030

3131
import unicorn._
3232

33-
case class UniqueUserId(id: UUID) extends BaseId[UUID]
33+
val ictc = new IsomorphicColumnTypeConversion
34+
import ictc._
35+
36+
case class UniqueUserId(id: UUID) extends BaseId[UUID] with MappedToBase
3437

3538
case class PersonRow(id: Option[UniqueUserId], name: String) extends WithId[UUID, UniqueUserId]
3639

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@ package org.virtuslab.unicorn.repositories
22

33
import org.virtuslab.unicorn.LongUnicornIdentifiers.IdCompanion
44
import org.virtuslab.unicorn.TestUnicorn.profile.api._
5-
import org.virtuslab.unicorn.{ BaseId, BaseTest, LongTestUnicorn }
5+
import org.virtuslab.unicorn.{ BaseId, BaseTest, IsomorphicColumnTypeConversion, LongTestUnicorn, MappedToBase }
66

77
import scala.concurrent.ExecutionContext.Implicits.global
88

99
class JunctionRepositoryTest extends BaseTest[Long] with LongTestUnicorn {
1010

1111
import unicorn._
1212

13+
val ictc = new IsomorphicColumnTypeConversion
14+
import ictc._
15+
1316
behavior of classOf[JunctionRepository[_, _, _]].getSimpleName
1417

15-
case class OrderId(id: Long) extends BaseId[Long]
18+
case class OrderId(id: Long) extends BaseId[Long] with MappedToBase
1619

1720
object OrderId extends IdCompanion[OrderId]
1821

19-
case class CustomerId(id: Long) extends BaseId[Long]
22+
case class CustomerId(id: Long) extends BaseId[Long] with MappedToBase
2023

2124
object CustomerId extends IdCompanion[CustomerId]
2225

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ trait AbstractUserTable {
1616
import unicorn.profile.api._
1717
import identifiers._
1818

19-
case class UserId(id: Long) extends BaseId[Long]
19+
val ictc = new IsomorphicColumnTypeConversion
20+
import ictc._
21+
22+
case class UserId(id: Long) extends BaseId[Long] with MappedToBase
2023

2124
object UserId extends CoreCompanion[UserId]
2225

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class UnicornPlayLike[Underlying](dbConfig: DatabaseConfig[JdbcProfile]
2020

2121
val profile: JdbcProfile = dbConfig.profile
2222

23-
val db: JdbcBackend#DatabaseDef = dbConfig.db
23+
val db: JdbcBackend#Database = dbConfig.db
2424
}
2525

2626
abstract class UnicornPlay[Underlying](dbConfig: DatabaseConfig[JdbcProfile])

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object StringUnicornPlayIdentifiers extends PlayIdentifiersImpl[String] {
1616

1717
import StringUnicornPlayIdentifiers._
1818

19-
case class UserId(id: String) extends BaseId[String]
19+
case class UserId(id: String) extends BaseId[String] with MappedToBase
2020

2121
object UserId extends IdCompanion[UserId]
2222

@@ -28,6 +28,9 @@ trait UserQuery {
2828
import unicorn._
2929
import unicorn.profile.api._
3030

31+
val ictc = new IsomorphicColumnTypeConversion
32+
import ictc._
33+
3134
class UserTable(tag: SlickTag) extends IdTable[UserId, UserRow](tag, "test") {
3235
def name = column[String]("name")
3336
override def * : ProvenShape[UserRow] = (id.?, name) <> (UserRow.tupled, UserRow.unapply)

0 commit comments

Comments
 (0)