Workaround typing changes in dotty/#14043

dotty-staging · Dec 16, 2021 · 1cc6154 · 1cc6154
1 parent 41532f2
commit 1cc6154
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/...-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala b/...-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala
@@ -66,7 +66,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
           arrayDecoder[LocalDate, LocalDate, Col](identity)
       }
       import newCtx._
-      inline def insertQ = quote { query[ArraysTestEntity].insert(lift(e)) }
+      inline def insertQ = quote { query[ArraysTestEntity].insert(lift[ArraysTestEntity](e)) }
       await(newCtx.run(insertQ))
       intercept[IllegalStateException] {
         await(newCtx.run(query[ArraysTestEntity])).head mustBe e
@@ -213,7 +213,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
           arrayDecoder[LocalDate, LocalDate, Col](identity)
       }
       import newCtx._
-      val insertQ = quote { query[ArraysTestEntity].insert(lift(e)) }
+      val insertQ = quote { query[ArraysTestEntity].insert(lift[ArraysTestEntity](e)) }
       await(newCtx.run(insertQ))
       intercept[IllegalStateException] {
         await(newCtx.run(query[ArraysTestEntity])).head mustBe e

diff --git a/...stgres/src/test/scala/io/getquill/context/jasync/postgres/PostgresAsyncEncodingSpec.scala b/...stgres/src/test/scala/io/getquill/context/jasync/postgres/PostgresAsyncEncodingSpec.scala
@@ -38,7 +38,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
     val rez0 = Await.result(testContext.run(q0), Duration.Inf)
 
     //insert new uuid
-    val rez1 = Await.result(testContext.run(query[EncodingUUIDTestEntity].insert(lift(EncodingUUIDTestEntity(testUUID)))), Duration.Inf)
+    val rez1 = Await.result(testContext.run(query[EncodingUUIDTestEntity].insert(lift[EncodingUUIDTestEntity](EncodingUUIDTestEntity(testUUID)))), Duration.Inf)
 
     //verify you can get the uuid back from the db
     val q2 = quote(query[EncodingUUIDTestEntity].map(p => p.v1))
@@ -95,7 +95,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
     val entity = DateEncodingTestEntity(JodaLocalDate.now, JodaLocalDateTime.now, JodaDateTime.now)
     val r = for {
       _ <- testContext.run(query[DateEncodingTestEntity].delete)
-      _ <- testContext.run(query[DateEncodingTestEntity].insert(lift(entity)))
+      _ <- testContext.run(query[DateEncodingTestEntity].insert(lift[DateEncodingTestEntity](entity)))
       result <- testContext.run(query[DateEncodingTestEntity])
     } yield result
     Await.result(r, Duration.Inf) mustBe Seq(entity)
@@ -106,7 +106,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
     val entity = DateEncodingTestEntity(LocalDate.now, LocalDateTime.now, ZonedDateTime.now)
     val r = for {
       _ <- testContext.run(query[DateEncodingTestEntity].delete)
-      _ <- testContext.run(query[DateEncodingTestEntity].insert(lift(entity)))
+      _ <- testContext.run(query[DateEncodingTestEntity].insert(lift[DateEncodingTestEntity](entity)))
       result <- testContext.run(query[DateEncodingTestEntity])
     } yield result
     Await.result(r, Duration.Inf) mustBe Seq(entity)

diff --git a/...-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/TransactionSpec.scala b/...-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/TransactionSpec.scala
@@ -27,16 +27,16 @@ class TransactionSpec extends PeopleSpec {
         for {
           _ <- testContext.run(query[Couple].delete)
           _ <- testContext.run(query[Person].delete)
-        } yield {}  
+        } yield {}
       }
     }
     Try {
       await {
         testContext.transaction { implicit ec =>
           for {
-            _ <- testContext.run(query[Couple].insert(lift(Couple("Alex", "Bert"))))
+            _ <- testContext.run(query[Couple].insert(lift[Couple](Couple("Alex", "Bert"))))
             _ <- scala.concurrent.Future { throw new RuntimeException("Blahblahblah") }
-            _ <- testContext.run(query[Person].insert(lift(Person("Alex", 60))))
+            _ <- testContext.run(query[Person].insert(lift[Person](Person("Alex", 60))))
           } yield {}
         }
       }
@@ -54,18 +54,18 @@ class TransactionSpec extends PeopleSpec {
         for {
           _ <- testContext.run(query[Couple].delete)
           _ <- testContext.run(query[Person].delete)
-        } yield {}  
+        } yield {}
       }
     }
     await {
       testContext.transaction { implicit ec =>
         for {
-          _ <- testContext.run(query[Couple].insert(lift(Couple("Alex", "Bert"))))
-          _ <- testContext.run(query[Person].insert(lift(Person("Alex", 60))))
+          _ <- testContext.run(query[Couple].insert(lift[Couple](Couple("Alex", "Bert"))))
+          _ <- testContext.run(query[Person].insert(lift[Person](Person("Alex", 60))))
         } yield {}
       }
     }
-    
+
     await(testContext.run(query[Couple])) mustEqual List(Couple("Alex", "Bert"))
     await(testContext.run(query[Person])) mustEqual List(Person("Alex", 60))
   }

diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/ArrayJdbcEncodingSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/ArrayJdbcEncodingSpec.scala
@@ -42,7 +42,7 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
         arrayDecoder[LocalDate, LocalDate, Col](identity)
     }
     import newCtx._
-    newCtx.run(query[ArraysTestEntity].insert(lift(corrected)))
+    newCtx.run(query[ArraysTestEntity].insert(lift[ArraysTestEntity](corrected)))
     intercept[IllegalStateException] {
       newCtx.run(query[ArraysTestEntity]).head mustBe corrected
     }
@@ -71,7 +71,7 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
 
   "empty array on found null" in {
     case class ArraysTestEntity(texts: Option[List[String]])
-    ctx.run(query[ArraysTestEntity].insert(lift(ArraysTestEntity(None))))
+    ctx.run(query[ArraysTestEntity].insert(lift[ArraysTestEntity](ArraysTestEntity(None))))
 
     case class E(texts: List[String])
     ctx.run(querySchema[E]("ArraysTestEntity")).headOption.map(_.texts) mustBe Some(Nil)

diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/JdbcEncodingSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/JdbcEncodingSpec.scala
@@ -43,10 +43,10 @@ class JdbcEncodingSpec extends EncodingSpec {
     val res: (List[EncodingTestEntity], List[EncodingTestEntity]) = {
       val steps = {
         testContext.run(query[EncodingTestEntity].delete)
-        testContext.run(query[EncodingTestEntity].insert(lift(e1)))
+        testContext.run(query[EncodingTestEntity].insert(lift[EncodingTestEntity](e1)))
         val withoutNull = testContext.run(query[EncodingTestEntity])
         testContext.run(query[EncodingTestEntity].delete)
-        testContext.run(query[EncodingTestEntity].insert(lift(e2)))
+        testContext.run(query[EncodingTestEntity].insert(lift[EncodingTestEntity](e2)))
         val withNull = testContext.run(query[EncodingTestEntity])
         (withoutNull, withNull)
       }

diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/ProductJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/ProductJdbcSpec.scala
@@ -56,7 +56,7 @@ class ProductJdbcSpec extends ProductSpec {
 
     "Single product insert with a method quotation" in {
       val prd = Product(0L, "test3", 3L)
-      val inserted = testContext.run(productInsert(lift(prd)))
+      val inserted = testContext.run(productInsert (lift(prd)))
       val returnedProduct = testContext.run(productById(lift(inserted))).head
       returnedProduct.description mustEqual "test3"
       returnedProduct.sku mustEqual 3L

diff --git a/quill-sql-tests/src/test/scala/io/getquill/ported/sqlidiomspec/ActionSpec.scala b/quill-sql-tests/src/test/scala/io/getquill/ported/sqlidiomspec/ActionSpec.scala
@@ -46,9 +46,9 @@ class ActionSpec extends Spec {
           val groups =
             testContext.run(
               liftQuery(List(v)).foreach(v => query[TestEntity].insert(v))
-            ).groups mustEqual 
+            ).groups mustEqual
               List((
-                "INSERT INTO TestEntity (s,i,l,o,b) VALUES (?, ?, ?, ?, ?)", 
+                "INSERT INTO TestEntity (s,i,l,o,b) VALUES (?, ?, ?, ?, ?)",
                 List(Row("_1" -> "s", "_2" -> 1, "_3" -> 2L, "_4" -> Some("_1" -> 1), "_5" -> true))
               )
             )
@@ -90,14 +90,14 @@ class ActionSpec extends Spec {
       "returning" in testContext.withDialect(MirrorSqlDialectWithReturnMulti) { ctx =>
         import ctx._
         val q = quote {
-          query[TestEntity].insert(lift(TestEntity("s", 1, 2L, Some(1), true))).returning(_.l)
+          query[TestEntity].insert(lift[TestEntity](TestEntity("s", 1, 2L, Some(1), true))).returning(_.l)
         }
         val run = ctx.run(q).string mustEqual
           "INSERT INTO TestEntity (s,i,l,o,b) VALUES (?, ?, ?, ?, ?)"
       }
       "returning generated" in {
         val q = quote {
-          query[TestEntity].insert(lift(TestEntity("s", 1, 2L, Some(1), true))).returningGenerated(_.l)
+          query[TestEntity].insert(lift[TestEntity](TestEntity("s", 1, 2L, Some(1), true))).returningGenerated(_.l)
         }
         val run = testContext.run(q).string mustEqual
           "INSERT INTO TestEntity (s,i,o,b) VALUES (?, ?, ?, ?)"

diff --git a/quill-sql/src/main/scala/io/getquill/Dsl.scala b/quill-sql/src/main/scala/io/getquill/Dsl.scala
@@ -53,7 +53,7 @@ trait Dsl extends QuoteDsl with QueryDsl with MetaDsl
 
 trait MetaDsl extends QueryDsl {
 
-  inline def schemaMeta[T](inline entity: String, inline columns: (T => (Any, String))*): SchemaMeta[T] = 
+  inline def schemaMeta[T](inline entity: String, inline columns: (T => (Any, String))*): SchemaMeta[T] =
     ${ SchemaMetaMacro[T]('this, 'entity, 'columns) }
 
   inline def queryMeta[T, R](inline expand: Quoted[Query[T] => Query[R]])(inline extract: R => T): QueryMeta[T, R] =