Fix translate spec

deusaquilus · deusaquilus · commit 5dcd45a06594 · 2024-12-05T00:42:02.000-05:00
diff --git a/quill-core/src/main/scala/io/getquill/context/ContextVerbTranslate.scala b/quill-core/src/main/scala/io/getquill/context/ContextVerbTranslate.scala
@@ -102,8 +102,8 @@ trait ContextTranslateProto {
     options: TranslateOptions = TranslateOptions()
   )(executionInfo: ExecutionInfo, dc: Runner): List[String] =
     groups.flatMap { group =>
-      group.prepare.map { _ =>
-        translateQuery(group.string, options = options)(executionInfo, dc)
+      (group.prepare zip group.liftings).map { case (_, liftings) =>
+        translateQuery(group.string, options = options, liftings = liftings)(executionInfo, dc)
       }
     }
 
diff --git a/quill-core/src/test/scala/io/getquill/context/ActionMacroSpec.scala b/quill-core/src/test/scala/io/getquill/context/ActionMacroSpec.scala
@@ -379,7 +379,6 @@ class ActionMacroSpec extends Spec {
       )
     }
   }
-
   "translate non-batched action" - {
     "normal" in {
       val q = quote {
@@ -393,21 +392,21 @@ class ActionMacroSpec extends Spec {
         qr1.insert(t => t.i -> lift(1))
       }
       testContext.translate(q) mustEqual
-        """querySchema("TestEntity").insert(t => t.i -> 1)"""
+        """querySchema("TestEntity").insert(t => t.i -> lift(1))"""
     }
     "case class lifting" in {
       val q = quote {
         qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true)))
       }
       testContext.translate(q) mustEqual
-        """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true))"""
     }
     "nested case class lifting" in {
       val q = quote { t: TestEntity =>
         qr1.insertValue(t)
       }
       testContext.translate(q(lift(TestEntity("s", 1, 2L, None, true)))) mustEqual
-        """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true))"""
     }
     "returning value" in {
       val q = quote {
@@ -421,21 +420,21 @@ class ActionMacroSpec extends Spec {
         qr1.insert(t => t.i -> lift(1)).returning(t => t.l)
       }
       testContext.translate(q) mustEqual
-        """querySchema("TestEntity").insert(t => t.i -> 1).returning((t) => t.l)"""
+        """querySchema("TestEntity").insert(t => t.i -> lift(1)).returning((t) => t.l)"""
     }
     "case class lifting + returning value" in {
       val q = quote {
         qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true))).returning(t => t.l)
       }
       testContext.translate(q) mustEqual
-        """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true).returning((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true)).returning((t) => t.l)"""
     }
     "case class lifting + returning generated value" in {
       val q = quote {
         qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true))).returningGenerated(t => t.l)
       }
       testContext.translate(q) mustEqual
-        """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.o -> null, v => v.b -> true).returningGenerated((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.o -> lift(None), v => v.b -> lift(true)).returningGenerated((t) => t.l)"""
     }
   }
 
@@ -454,17 +453,17 @@ class ActionMacroSpec extends Spec {
         liftQuery(List(1, 2)).foreach((p: Int) => insert(p))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(t => t.i -> 1)""",
-        """querySchema("TestEntity").insert(t => t.i -> 2)"""
+        """querySchema("TestEntity").insert(t => t.i -> lift(1))""",
+        """querySchema("TestEntity").insert(t => t.i -> lift(2))"""
       )
     }
     "case class" in {
       val q = quote {
         liftQuery(entities).foreach(p => qr1.insertValue(p))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""
       )
     }
     "case class + nested action" in {
@@ -475,8 +474,8 @@ class ActionMacroSpec extends Spec {
         liftQuery(entities).foreach(p => nested(p))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""
       )
     }
     "tuple + case class + nested action" in {
@@ -487,8 +486,8 @@ class ActionMacroSpec extends Spec {
         liftQuery(entities).foreach(p => nested(lift("s"), p))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").filter(t1 => t1.s == 's').update(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",
-        """querySchema("TestEntity").filter(t1 => t1.s == 's').update(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""
+        """querySchema("TestEntity").filter(t1 => t1.s == lift('s')).update(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",
+        """querySchema("TestEntity").filter(t1 => t1.s == lift('s')).update(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""
       )
     }
     "zipWithIndex" in {
@@ -499,8 +498,8 @@ class ActionMacroSpec extends Spec {
         liftQuery(entities.zipWithIndex).foreach(p => nested(p._1, p._2))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").filter(t1 => t1.i == 0).update(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",
-        """querySchema("TestEntity").filter(t1 => t1.i == 1).update(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""
+        """querySchema("TestEntity").filter(t1 => t1.i == lift(0)).update(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",
+        """querySchema("TestEntity").filter(t1 => t1.i == lift(1)).update(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""
       )
     }
     "scalar + returning" in {
@@ -511,44 +510,44 @@ class ActionMacroSpec extends Spec {
         liftQuery(List(1, 2)).foreach((p: Int) => insert(p))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(t => t.i -> 1).returning((t) => t.l)""",
-        """querySchema("TestEntity").insert(t => t.i -> 2).returning((t) => t.l)"""
+        """querySchema("TestEntity").insert(t => t.i -> lift(1)).returning((t) => t.l)""",
+        """querySchema("TestEntity").insert(t => t.i -> lift(2)).returning((t) => t.l)"""
       )
     }
     "case class + returning" in {
       val q = quote {
         liftQuery(entities).foreach(p => qr1.insertValue(p).returning(t => t.l))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true).returning((t) => t.l)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false).returning((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returning((t) => t.l)""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returning((t) => t.l)"""
       )
     }
     "case class + returning + nested action" in {
       val insert = quote { p: TestEntity =>
         qr1.insertValue(p).returning(t => t.l)
       }
       testContext.translate(liftQuery(entities).foreach(p => insert(p))) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true).returning((t) => t.l)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false).returning((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returning((t) => t.l)""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returning((t) => t.l)"""
       )
     }
     "case class + returning generated" in {
       val q = quote {
         liftQuery(entities).foreach(p => qr1.insertValue(p).returningGenerated(t => t.l))
       }
       testContext.translate(q) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.o -> 4, v => v.b -> true).returningGenerated((t) => t.l)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.o -> 8, v => v.b -> false).returningGenerated((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returningGenerated((t) => t.l)""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returningGenerated((t) => t.l)"""
       )
     }
     "case class + returning generated + nested action" in {
       val insert = quote { p: TestEntity =>
         qr1.insertValue(p).returningGenerated(t => t.l)
       }
       testContext.translate(liftQuery(entities).foreach(p => insert(p))) mustEqual List(
-        """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.o -> 4, v => v.b -> true).returningGenerated((t) => t.l)""",
-        """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.o -> 8, v => v.b -> false).returningGenerated((t) => t.l)"""
+        """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returningGenerated((t) => t.l)""",
+        """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returningGenerated((t) => t.l)"""
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ trait ContextTranslateProto {`
`102`	`102`	`options: TranslateOptions = TranslateOptions()`
`103`	`103`	`)(executionInfo: ExecutionInfo, dc: Runner): List[String] =`
`104`	`104`	`groups.flatMap { group =>`
`105`		`- group.prepare.map { _ =>`
`106`		`- translateQuery(group.string, options = options)(executionInfo, dc)`
	`105`	`+ (group.prepare zip group.liftings).map { case (_, liftings) =>`
	`106`	`+ translateQuery(group.string, options = options, liftings = liftings)(executionInfo, dc)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,6 @@ class ActionMacroSpec extends Spec {`
`379`	`379`	`)`
`380`	`380`	`}`
`381`	`381`	`}`
`382`		`-`
`383`	`382`	`"translate non-batched action" - {`
`384`	`383`	`"normal" in {`
`385`	`384`	`val q = quote {`
`@@ -393,21 +392,21 @@ class ActionMacroSpec extends Spec {`
`393`	`392`	`qr1.insert(t => t.i -> lift(1))`
`394`	`393`	`}`
`395`	`394`	`testContext.translate(q) mustEqual`
`396`		`- """querySchema("TestEntity").insert(t => t.i -> 1)"""`
	`395`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(1))"""`
`397`	`396`	`}`
`398`	`397`	`"case class lifting" in {`
`399`	`398`	`val q = quote {`
`400`	`399`	`qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true)))`
`401`	`400`	`}`
`402`	`401`	`testContext.translate(q) mustEqual`
`403`		`- """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true)"""`
	`402`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true))"""`
`404`	`403`	`}`
`405`	`404`	`"nested case class lifting" in {`
`406`	`405`	`val q = quote { t: TestEntity =>`
`407`	`406`	`qr1.insertValue(t)`
`408`	`407`	`}`
`409`	`408`	`testContext.translate(q(lift(TestEntity("s", 1, 2L, None, true)))) mustEqual`
`410`		`- """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true)"""`
	`409`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true))"""`
`411`	`410`	`}`
`412`	`411`	`"returning value" in {`
`413`	`412`	`val q = quote {`
`@@ -421,21 +420,21 @@ class ActionMacroSpec extends Spec {`
`421`	`420`	`qr1.insert(t => t.i -> lift(1)).returning(t => t.l)`
`422`	`421`	`}`
`423`	`422`	`testContext.translate(q) mustEqual`
`424`		`- """querySchema("TestEntity").insert(t => t.i -> 1).returning((t) => t.l)"""`
	`423`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(1)).returning((t) => t.l)"""`
`425`	`424`	`}`
`426`	`425`	`"case class lifting + returning value" in {`
`427`	`426`	`val q = quote {`
`428`	`427`	`qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true))).returning(t => t.l)`
`429`	`428`	`}`
`430`	`429`	`testContext.translate(q) mustEqual`
`431`		`- """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.l -> 2, v => v.o -> null, v => v.b -> true).returning((t) => t.l)"""`
	`430`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.l -> lift(2), v => v.o -> lift(None), v => v.b -> lift(true)).returning((t) => t.l)"""`
`432`	`431`	`}`
`433`	`432`	`"case class lifting + returning generated value" in {`
`434`	`433`	`val q = quote {`
`435`	`434`	`qr1.insertValue(lift(TestEntity("s", 1, 2L, None, true))).returningGenerated(t => t.l)`
`436`	`435`	`}`
`437`	`436`	`testContext.translate(q) mustEqual`
`438`		`- """querySchema("TestEntity").insert(v => v.s -> 's', v => v.i -> 1, v => v.o -> null, v => v.b -> true).returningGenerated((t) => t.l)"""`
	`437`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s'), v => v.i -> lift(1), v => v.o -> lift(None), v => v.b -> lift(true)).returningGenerated((t) => t.l)"""`
`439`	`438`	`}`
`440`	`439`	`}`
`441`	`440`
`@@ -454,17 +453,17 @@ class ActionMacroSpec extends Spec {`
`454`	`453`	`liftQuery(List(1, 2)).foreach((p: Int) => insert(p))`
`455`	`454`	`}`
`456`	`455`	`testContext.translate(q) mustEqual List(`
`457`		`- """querySchema("TestEntity").insert(t => t.i -> 1)""",`
`458`		`- """querySchema("TestEntity").insert(t => t.i -> 2)"""`
	`456`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(1))""",`
	`457`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(2))"""`
`459`	`458`	`)`
`460`	`459`	`}`
`461`	`460`	`"case class" in {`
`462`	`461`	`val q = quote {`
`463`	`462`	`liftQuery(entities).foreach(p => qr1.insertValue(p))`
`464`	`463`	`}`
`465`	`464`	`testContext.translate(q) mustEqual List(`
`466`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",`
`467`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""`
	`465`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",`
	`466`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""`
`468`	`467`	`)`
`469`	`468`	`}`
`470`	`469`	`"case class + nested action" in {`
`@@ -475,8 +474,8 @@ class ActionMacroSpec extends Spec {`
`475`	`474`	`liftQuery(entities).foreach(p => nested(p))`
`476`	`475`	`}`
`477`	`476`	`testContext.translate(q) mustEqual List(`
`478`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",`
`479`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""`
	`477`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",`
	`478`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""`
`480`	`479`	`)`
`481`	`480`	`}`
`482`	`481`	`"tuple + case class + nested action" in {`
`@@ -487,8 +486,8 @@ class ActionMacroSpec extends Spec {`
`487`	`486`	`liftQuery(entities).foreach(p => nested(lift("s"), p))`
`488`	`487`	`}`
`489`	`488`	`testContext.translate(q) mustEqual List(`
`490`		`- """querySchema("TestEntity").filter(t1 => t1.s == 's').update(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",`
`491`		`- """querySchema("TestEntity").filter(t1 => t1.s == 's').update(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""`
	`489`	`+ """querySchema("TestEntity").filter(t1 => t1.s == lift('s')).update(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",`
	`490`	`+ """querySchema("TestEntity").filter(t1 => t1.s == lift('s')).update(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""`
`492`	`491`	`)`
`493`	`492`	`}`
`494`	`493`	`"zipWithIndex" in {`
`@@ -499,8 +498,8 @@ class ActionMacroSpec extends Spec {`
`499`	`498`	`liftQuery(entities.zipWithIndex).foreach(p => nested(p._1, p._2))`
`500`	`499`	`}`
`501`	`500`	`testContext.translate(q) mustEqual List(`
`502`		`- """querySchema("TestEntity").filter(t1 => t1.i == 0).update(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true)""",`
`503`		`- """querySchema("TestEntity").filter(t1 => t1.i == 1).update(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false)"""`
	`501`	`+ """querySchema("TestEntity").filter(t1 => t1.i == lift(0)).update(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true))""",`
	`502`	`+ """querySchema("TestEntity").filter(t1 => t1.i == lift(1)).update(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false))"""`
`504`	`503`	`)`
`505`	`504`	`}`
`506`	`505`	`"scalar + returning" in {`
`@@ -511,44 +510,44 @@ class ActionMacroSpec extends Spec {`
`511`	`510`	`liftQuery(List(1, 2)).foreach((p: Int) => insert(p))`
`512`	`511`	`}`
`513`	`512`	`testContext.translate(q) mustEqual List(`
`514`		`- """querySchema("TestEntity").insert(t => t.i -> 1).returning((t) => t.l)""",`
`515`		`- """querySchema("TestEntity").insert(t => t.i -> 2).returning((t) => t.l)"""`
	`513`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(1)).returning((t) => t.l)""",`
	`514`	`+ """querySchema("TestEntity").insert(t => t.i -> lift(2)).returning((t) => t.l)"""`
`516`	`515`	`)`
`517`	`516`	`}`
`518`	`517`	`"case class + returning" in {`
`519`	`518`	`val q = quote {`
`520`	`519`	`liftQuery(entities).foreach(p => qr1.insertValue(p).returning(t => t.l))`
`521`	`520`	`}`
`522`	`521`	`testContext.translate(q) mustEqual List(`
`523`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true).returning((t) => t.l)""",`
`524`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false).returning((t) => t.l)"""`
	`522`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returning((t) => t.l)""",`
	`523`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returning((t) => t.l)"""`
`525`	`524`	`)`
`526`	`525`	`}`
`527`	`526`	`"case class + returning + nested action" in {`
`528`	`527`	`val insert = quote { p: TestEntity =>`
`529`	`528`	`qr1.insertValue(p).returning(t => t.l)`
`530`	`529`	`}`
`531`	`530`	`testContext.translate(liftQuery(entities).foreach(p => insert(p))) mustEqual List(`
`532`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.l -> 3, v => v.o -> 4, v => v.b -> true).returning((t) => t.l)""",`
`533`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.l -> 7, v => v.o -> 8, v => v.b -> false).returning((t) => t.l)"""`
	`531`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.l -> lift(3), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returning((t) => t.l)""",`
	`532`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.l -> lift(7), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returning((t) => t.l)"""`
`534`	`533`	`)`
`535`	`534`	`}`
`536`	`535`	`"case class + returning generated" in {`
`537`	`536`	`val q = quote {`
`538`	`537`	`liftQuery(entities).foreach(p => qr1.insertValue(p).returningGenerated(t => t.l))`
`539`	`538`	`}`
`540`	`539`	`testContext.translate(q) mustEqual List(`
`541`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.o -> 4, v => v.b -> true).returningGenerated((t) => t.l)""",`
`542`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.o -> 8, v => v.b -> false).returningGenerated((t) => t.l)"""`
	`540`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returningGenerated((t) => t.l)""",`
	`541`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returningGenerated((t) => t.l)"""`
`543`	`542`	`)`
`544`	`543`	`}`
`545`	`544`	`"case class + returning generated + nested action" in {`
`546`	`545`	`val insert = quote { p: TestEntity =>`
`547`	`546`	`qr1.insertValue(p).returningGenerated(t => t.l)`
`548`	`547`	`}`
`549`	`548`	`testContext.translate(liftQuery(entities).foreach(p => insert(p))) mustEqual List(`
`550`		`- """querySchema("TestEntity").insert(v => v.s -> 's1', v => v.i -> 2, v => v.o -> 4, v => v.b -> true).returningGenerated((t) => t.l)""",`
`551`		`- """querySchema("TestEntity").insert(v => v.s -> 's5', v => v.i -> 6, v => v.o -> 8, v => v.b -> false).returningGenerated((t) => t.l)"""`
	`549`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s1'), v => v.i -> lift(2), v => v.o -> lift(Some(4)), v => v.b -> lift(true)).returningGenerated((t) => t.l)""",`
	`550`	`+ """querySchema("TestEntity").insert(v => v.s -> lift('s5'), v => v.i -> lift(6), v => v.o -> lift(Some(8)), v => v.b -> lift(false)).returningGenerated((t) => t.l)"""`
`552`	`551`	`)`
`553`	`552`	`}`
`554`	`553`	`}`