more fixes

Author: deusaquilus

quill-core/src/test/scala/io/getquill/context/ContextMacroSpec.scala

@@ -270,7 +270,7 @@ class ContextMacroSpec extends Spec {
           qr1.filter(t => t.s == lift("a"))
         }
         testContext.translate(q) mustEqual
-          """querySchema("TestEntity").filter(t => t.s == 'a')"""
+          """querySchema("TestEntity").filter(t => t.s == lift('a'))"""
       }
 
       "value class" in {
@@ -279,35 +279,35 @@ class ContextMacroSpec extends Spec {
           query[Entity].filter(t => t.x == lift(ValueClass(1)))
         }
         testContext.translate(q) mustEqual
-          """querySchema("Entity").filter(t => t.x == 1)"""
+          """querySchema("Entity").filter(t => t.x == lift(ValueClass(1)))"""
       }
       "generic value class" in {
         case class Entity(x: GenericValueClass[Int])
         val q = quote {
           query[Entity].filter(t => t.x == lift(GenericValueClass(1)))
         }
         testContext.translate(q) mustEqual
-          """querySchema("Entity").filter(t => t.x == 1)"""
+          """querySchema("Entity").filter(t => t.x == lift(GenericValueClass(1)))"""
       }
       "sql" in {
         val q = quote {
           sql"SELECT ${lift("a")}".as[Query[String]]
         }
-        testContext.translate(q) mustEqual s"""sql"SELECT $${'a'}".map(x => x)"""
+        testContext.translate(q) mustEqual s"""sql"SELECT $${lift('a')}".map(x => x)"""
       }
       "dynamic" in {
         val q = quote {
           qr1.filter(t => t.s == lift("a"))
         }
         testContext.translate(q.dynamic) mustEqual
-          """querySchema("TestEntity").filter(t => t.s == 'a')"""
+          """querySchema("TestEntity").filter(t => t.s == lift('a'))"""
       }
       "dynamic type param" in {
         def test[T: SchemaMeta: QueryMeta] = quote {
           query[T].map(t => lift(1))
         }
         testContext.translate(test[TestEntity]) mustEqual
-          """querySchema("TestEntity").map(t => 1)"""
+          """querySchema("TestEntity").map(t => lift(1))"""
       }
     }
     "aggregated" in {