Skip to content

Commit 5ed25aa

Browse files
nicolasstuckinicolasstucki
committed
Workaround typing changes in dotty/#14043
1 parent 41532f2 commit 5ed25aa

File tree

13 files changed

+94
-94
lines changed

13 files changed

+94
-94
lines changed

‎quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/ArrayAsyncEncodingSpec.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
1818
inline def q = quote(query[ArraysTestEntity])
1919

2020
"Support all sql base types and `Iterable` implementers" in {
21-
await(ctx.run(q.insert(lift(e))))
21+
await(ctx.run(q.insertValue(lift(e))))
2222
val actual = await(ctx.run(q)).head
2323
actual mustEqual e
2424
baseEntityDeepCheck(actual, e)
@@ -28,7 +28,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
2828
case class JodaTimes(timestamps: Seq[JodaLocalDateTime], dates: Seq[JodaLocalDate])
2929
val jE = JodaTimes(Seq(JodaLocalDateTime.now()), Seq(JodaLocalDate.now()))
3030
inline def jQ = quote(querySchema[JodaTimes]("ArraysTestEntity"))
31-
await(ctx.run(jQ.insert(lift(jE))))
31+
await(ctx.run(jQ.insertValue(lift(jE))))
3232
val actual = await(ctx.run(jQ)).head
3333
actual.timestamps mustBe jE.timestamps
3434
actual.dates mustBe jE.dates
@@ -38,7 +38,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
3838
case class JodaTimes(timestamps: Seq[JodaDateTime])
3939
val jE = JodaTimes(Seq(JodaDateTime.now()))
4040
inline def jQ = quote(querySchema[JodaTimes]("ArraysTestEntity"))
41-
await(ctx.run(jQ.insert(lift(jE))))
41+
await(ctx.run(jQ.insertValue(lift(jE))))
4242
val actual = await(ctx.run(jQ)).head
4343
actual.timestamps mustBe jE.timestamps
4444
}
@@ -47,15 +47,15 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
4747
case class Java8Times(timestamps: Seq[LocalDateTime], dates: Seq[LocalDate])
4848
val jE = Java8Times(Seq(LocalDateTime.now()), Seq(LocalDate.now()))
4949
inline def jQ = quote(querySchema[Java8Times]("ArraysTestEntity"))
50-
await(ctx.run(jQ.insert(lift(jE))))
50+
await(ctx.run(jQ.insertValue(lift(jE))))
5151
val actual = await(ctx.run(jQ)).head
5252
actual.timestamps mustBe jE.timestamps
5353
actual.dates mustBe jE.dates
5454
}
5555

5656
"Support Iterable encoding basing on MappedEncoding" in {
5757
inline def wrapQ = quote(querySchema[WrapEntity]("ArraysTestEntity"))
58-
await(ctx.run(wrapQ.insert(lift(wrapE))))
58+
await(ctx.run(wrapQ.insertValue(lift(wrapE))))
5959
await(ctx.run(wrapQ)).head mustBe wrapE
6060
}
6161

@@ -66,7 +66,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
6666
arrayDecoder[LocalDate, LocalDate, Col](identity)
6767
}
6868
import newCtx._
69-
inline def insertQ = quote { query[ArraysTestEntity].insert(lift(e)) }
69+
inline def insertQ = quote { query[ArraysTestEntity].insertValue(lift(e)) }
7070
await(newCtx.run(insertQ))
7171
intercept[IllegalStateException] {
7272
await(newCtx.run(query[ArraysTestEntity])).head mustBe e
@@ -75,7 +75,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
7575
}
7676

7777
"Arrays in where clause" in {
78-
await(ctx.run(q.insert(lift(e))))
78+
await(ctx.run(q.insertValue(lift(e))))
7979
val actual1 = await(ctx.run(q.filter(_.texts == lift(List("test")))))
8080
val actual2 = await(ctx.run(q.filter(_.texts == lift(List("test2")))))
8181
baseEntityDeepCheck(actual1.head, e)
@@ -154,7 +154,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
154154
inline def realEntity = quote {
155155
querySchema[RealEncodingTestEntity]("EncodingTestEntity")
156156
}
157-
await(ctx.run(realEntity.insert(lift(insertValue))))
157+
await(ctx.run(realEntity.insertValue(lift(insertValue))))
158158

159159
case class EncodingTestEntity(v1: List[String])
160160
intercept[IllegalStateException](await(ctx.run(query[EncodingTestEntity])))
@@ -165,7 +165,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
165165
val q = quote(query[ArraysTestEntity])
166166

167167
"Support all sql base types and `Iterable` implementers" in {
168-
await(ctx.run(q.insert(lift(e))))
168+
await(ctx.run(q.insertValue(lift(e))))
169169
val actual = await(ctx.run(q)).head
170170
actual mustEqual e
171171
baseEntityDeepCheck(actual, e)
@@ -175,7 +175,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
175175
case class JodaTimes(timestamps: Seq[JodaLocalDateTime], dates: Seq[JodaLocalDate])
176176
val jE = JodaTimes(Seq(JodaLocalDateTime.now()), Seq(JodaLocalDate.now()))
177177
val jQ = quote(querySchema[JodaTimes]("ArraysTestEntity"))
178-
await(ctx.run(jQ.insert(lift(jE))))
178+
await(ctx.run(jQ.insertValue(lift(jE))))
179179
val actual = await(ctx.run(jQ)).head
180180
actual.timestamps mustBe jE.timestamps
181181
actual.dates mustBe jE.dates
@@ -185,7 +185,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
185185
case class JodaTimes(timestamps: Seq[JodaDateTime])
186186
val jE = JodaTimes(Seq(JodaDateTime.now()))
187187
val jQ = quote(querySchema[JodaTimes]("ArraysTestEntity"))
188-
await(ctx.run(jQ.insert(lift(jE))))
188+
await(ctx.run(jQ.insertValue(lift(jE))))
189189
val actual = await(ctx.run(jQ)).head
190190
actual.timestamps mustBe jE.timestamps
191191
}
@@ -194,15 +194,15 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
194194
case class Java8Times(timestamps: Seq[LocalDateTime], dates: Seq[LocalDate])
195195
val jE = Java8Times(Seq(LocalDateTime.now()), Seq(LocalDate.now()))
196196
val jQ = quote(querySchema[Java8Times]("ArraysTestEntity"))
197-
await(ctx.run(jQ.insert(lift(jE))))
197+
await(ctx.run(jQ.insertValue(lift(jE))))
198198
val actual = await(ctx.run(jQ)).head
199199
actual.timestamps mustBe jE.timestamps
200200
actual.dates mustBe jE.dates
201201
}
202202

203203
"Support Iterable encoding basing on MappedEncoding" in {
204204
val wrapQ = quote(querySchema[WrapEntity]("ArraysTestEntity"))
205-
await(ctx.run(wrapQ.insert(lift(wrapE))))
205+
await(ctx.run(wrapQ.insertValue(lift(wrapE))))
206206
await(ctx.run(wrapQ)).head mustBe wrapE
207207
}
208208

@@ -213,7 +213,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
213213
arrayDecoder[LocalDate, LocalDate, Col](identity)
214214
}
215215
import newCtx._
216-
val insertQ = quote { query[ArraysTestEntity].insert(lift(e)) }
216+
val insertQ = quote { query[ArraysTestEntity].insertValue(lift(e)) }
217217
await(newCtx.run(insertQ))
218218
intercept[IllegalStateException] {
219219
await(newCtx.run(query[ArraysTestEntity])).head mustBe e
@@ -222,7 +222,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
222222
}
223223

224224
"Arrays in where clause" in {
225-
await(ctx.run(q.insert(lift(e))))
225+
await(ctx.run(q.insertValue(lift(e))))
226226
val actual1 = await(ctx.run(q.filter(_.texts == lift(List("test")))))
227227
val actual2 = await(ctx.run(q.filter(_.texts == lift(List("test2")))))
228228
baseEntityDeepCheck(actual1.head, e)
@@ -301,7 +301,7 @@ class ArrayAsyncEncodingSpec extends ArrayEncodingBaseSpec {
301301
val realEntity = quote {
302302
querySchema[RealEncodingTestEntity]("EncodingTestEntity")
303303
}
304-
await(ctx.run(realEntity.insert(lift(insertValue))))
304+
await(ctx.run(realEntity.insertValue(lift(insertValue))))
305305

306306
case class EncodingTestEntity(v1: List[String])
307307
intercept[IllegalStateException](await(ctx.run(query[EncodingTestEntity])))

‎quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/PostgresAsyncEncodingSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
3838
val rez0 = Await.result(testContext.run(q0), Duration.Inf)
3939

4040
//insert new uuid
41-
val rez1 = Await.result(testContext.run(query[EncodingUUIDTestEntity].insert(lift(EncodingUUIDTestEntity(testUUID)))), Duration.Inf)
41+
val rez1 = Await.result(testContext.run(query[EncodingUUIDTestEntity].insertValue(lift(EncodingUUIDTestEntity(testUUID)))), Duration.Inf)
4242

4343
//verify you can get the uuid back from the db
4444
val q2 = quote(query[EncodingUUIDTestEntity].map(p => p.v1))
@@ -95,7 +95,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
9595
val entity = DateEncodingTestEntity(JodaLocalDate.now, JodaLocalDateTime.now, JodaDateTime.now)
9696
val r = for {
9797
_ <- testContext.run(query[DateEncodingTestEntity].delete)
98-
_ <- testContext.run(query[DateEncodingTestEntity].insert(lift(entity)))
98+
_ <- testContext.run(query[DateEncodingTestEntity].insertValue(lift(entity)))
9999
result <- testContext.run(query[DateEncodingTestEntity])
100100
} yield result
101101
Await.result(r, Duration.Inf) mustBe Seq(entity)
@@ -106,7 +106,7 @@ class PostgresAsyncEncodingSpec extends EncodingSpec {
106106
val entity = DateEncodingTestEntity(LocalDate.now, LocalDateTime.now, ZonedDateTime.now)
107107
val r = for {
108108
_ <- testContext.run(query[DateEncodingTestEntity].delete)
109-
_ <- testContext.run(query[DateEncodingTestEntity].insert(lift(entity)))
109+
_ <- testContext.run(query[DateEncodingTestEntity].insertValue(lift(entity)))
110110
result <- testContext.run(query[DateEncodingTestEntity])
111111
} yield result
112112
Await.result(r, Duration.Inf) mustBe Seq(entity)

‎quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/PostgresJAsyncContextSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ class PostgresJAsyncContextSpec extends Spec {
2020

2121
"Insert with returning with single column table" in {
2222
val inserted: Long = await(testContext.run {
23-
qr4.insert(lift(TestEntity4(0))).returningGenerated(_.i)
23+
qr4.insertValue(lift(TestEntity4(0))).returningGenerated(_.i)
2424
})
2525
await(testContext.run(qr4.filter(_.i == lift(inserted))))
2626
.head.i mustBe inserted
2727
}
2828
"Insert with returning with multiple columns" in {
2929
await(testContext.run(qr1.delete))
3030
val inserted = await(testContext.run {
31-
qr1.insert(lift(TestEntity("foo", 1, 18L, Some(123), true))).returning(r => (r.i, r.s, r.o))
31+
qr1.insertValue(lift(TestEntity("foo", 1, 18L, Some(123), true))).returning(r => (r.i, r.s, r.o))
3232
})
3333
(1, "foo", Some(123)) mustBe inserted
3434
}

‎quill-jasync-postgres/src/test/scala/io/getquill/context/jasync/postgres/TransactionSpec.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ class TransactionSpec extends PeopleSpec {
2727
for {
2828
_ <- testContext.run(query[Couple].delete)
2929
_ <- testContext.run(query[Person].delete)
30-
} yield {}
30+
} yield {}
3131
}
3232
}
3333
Try {
3434
await {
3535
testContext.transaction { implicit ec =>
3636
for {
37-
_ <- testContext.run(query[Couple].insert(lift(Couple("Alex", "Bert"))))
37+
_ <- testContext.run(query[Couple].insertValue(lift(Couple("Alex", "Bert"))))
3838
_ <- scala.concurrent.Future { throw new RuntimeException("Blahblahblah") }
39-
_ <- testContext.run(query[Person].insert(lift(Person("Alex", 60))))
39+
_ <- testContext.run(query[Person].insertValue(lift(Person("Alex", 60))))
4040
} yield {}
4141
}
4242
}
@@ -54,18 +54,18 @@ class TransactionSpec extends PeopleSpec {
5454
for {
5555
_ <- testContext.run(query[Couple].delete)
5656
_ <- testContext.run(query[Person].delete)
57-
} yield {}
57+
} yield {}
5858
}
5959
}
6060
await {
6161
testContext.transaction { implicit ec =>
6262
for {
63-
_ <- testContext.run(query[Couple].insert(lift(Couple("Alex", "Bert"))))
64-
_ <- testContext.run(query[Person].insert(lift(Person("Alex", 60))))
63+
_ <- testContext.run(query[Couple].insertValue(lift(Couple("Alex", "Bert"))))
64+
_ <- testContext.run(query[Person].insertValue(lift(Person("Alex", 60))))
6565
} yield {}
6666
}
6767
}
68-
68+
6969
await(testContext.run(query[Couple])) mustEqual List(Couple("Alex", "Bert"))
7070
await(testContext.run(query[Person])) mustEqual List(Person("Alex", 60))
7171
}

‎quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/ArrayJdbcEncodingSpec.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
1515
val corrected = e.copy(timestamps = e.timestamps.map(d => new Timestamp(d.getTime)))
1616

1717
"Support all sql base types and `Seq` implementers" in {
18-
ctx.run(q.insert(lift(corrected)))
18+
ctx.run(q.insertValue(lift(corrected)))
1919
val actual = ctx.run(q).head
2020
actual mustEqual corrected
2121
baseEntityDeepCheck(actual, corrected)
2222
}
2323

2424
"Support Seq encoding basing on MappedEncoding" in {
2525
val wrapQ = quote(querySchema[WrapEntity]("ArraysTestEntity"))
26-
ctx.run(wrapQ.insert(lift(wrapE)))
26+
ctx.run(wrapQ.insertValue(lift(wrapE)))
2727
ctx.run(wrapQ).head.texts mustBe wrapE.texts
2828
}
2929

3030
"Timestamps" in {
3131
case class Timestamps(timestamps: List[Timestamp])
3232
val tE = Timestamps(List(new Timestamp(System.currentTimeMillis())))
3333
val tQ = quote(querySchema[Timestamps]("ArraysTestEntity"))
34-
ctx.run(tQ.insert(lift(tE)))
34+
ctx.run(tQ.insertValue(lift(tE)))
3535
ctx.run(tQ).head.timestamps mustBe tE.timestamps
3636
}
3737

@@ -42,7 +42,7 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
4242
arrayDecoder[LocalDate, LocalDate, Col](identity)
4343
}
4444
import newCtx._
45-
newCtx.run(query[ArraysTestEntity].insert(lift(corrected)))
45+
newCtx.run(query[ArraysTestEntity].insertValue(lift(corrected)))
4646
intercept[IllegalStateException] {
4747
newCtx.run(query[ArraysTestEntity]).head mustBe corrected
4848
}
@@ -57,12 +57,12 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
5757
implicit def arrayUUIDEncoder[Col <: Seq[UUID]]: Encoder[Col] = arrayRawEncoder[UUID, Col]("uuid")
5858
implicit def arrayUUIDDecoder[Col <: Seq[UUID]](implicit bf: CBF[UUID, Col]): Decoder[Col] = arrayRawDecoder[UUID, Col]
5959

60-
ctx.run(q.insert(lift(e)))
60+
ctx.run(q.insertValue(lift(e)))
6161
ctx.run(q).head.uuids mustBe e.uuids
6262
}
6363

6464
"Arrays in where clause" in {
65-
ctx.run(q.insert(lift(corrected)))
65+
ctx.run(q.insertValue(lift(corrected)))
6666
val actual1 = ctx.run(q.filter(_.texts == lift(List("test"))))
6767
val actual2 = ctx.run(q.filter(_.texts == lift(List("test2"))))
6868
actual1 mustEqual List(corrected)
@@ -71,7 +71,7 @@ class ArrayJdbcEncodingSpec extends ArrayEncodingBaseSpec {
7171

7272
"empty array on found null" in {
7373
case class ArraysTestEntity(texts: Option[List[String]])
74-
ctx.run(query[ArraysTestEntity].insert(lift(ArraysTestEntity(None))))
74+
ctx.run(query[ArraysTestEntity].insertValue(lift(ArraysTestEntity(None))))
7575

7676
case class E(texts: List[String])
7777
ctx.run(querySchema[E]("ArraysTestEntity")).headOption.map(_.texts) mustBe Some(Nil)

0 commit comments

Comments
 (0)