Fix liftQueryScalar

zio · Aug 13, 2019 · 60d1499 · 60d1499
1 parent 9b4f31e
commit 60d1499
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/quill-core/src/test/scala/io/getquill/context/ContextInstanceSpec.scala b/quill-core/src/test/scala/io/getquill/context/ContextInstanceSpec.scala
@@ -32,6 +32,16 @@ class ContextInstanceSpec extends Spec {
         }
         testContext.run(q).extractor(Row("s")) mustEqual Entity(StringValue("s"))
       }
+
+      "encoding with set" in {
+        implicit val testToString = MappedEncoding[StringValue, String](_.s)
+        implicit val stringToTest = MappedEncoding[String, StringValue](StringValue)
+        case class Entity(x: StringValue)
+        val q = quote {
+          query[Entity].filter(e => liftQueryScalar(Set(StringValue("1"))).contains(e.x))
+        }
+        testContext.run(q).prepareRow mustEqual Row("1")
+      }
     }
     "package-based" - {
       import io.getquill.MappedEncoding

diff --git a/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/PeopleJdbcSpec.scala b/quill-jdbc/src/test/scala/io/getquill/context/jdbc/postgres/PeopleJdbcSpec.scala
@@ -25,10 +25,6 @@ class PeopleJdbcSpec extends PeopleSpec {
     testContext.run(`Ex 2 rangeSimple`(lift(`Ex 2 param 1`), lift(`Ex 2 param 2`))) mustEqual `Ex 2 expected result`
   }
 
-  "Example 3 - satisfies" in {
-    testContext.run(`Ex 3 satisfies`) mustEqual `Ex 3 expected result`
-  }
-
   "Example 4 - satisfies" in {
     testContext.run(`Ex 4 satisfies`) mustEqual `Ex 4 expected result`
   }
@@ -57,4 +53,8 @@ class PeopleJdbcSpec extends PeopleSpec {
     testContext.run(`Ex 10 page 1 query`) mustEqual `Ex 10 page 1 expected`
     testContext.run(`Ex 10 page 2 query`) mustEqual `Ex 10 page 2 expected`
   }
+
+  "Example 11 - contains non empty with custom encoder/decoder" in {
+    testContext.run(`Ex 11 contains`(`Ex 11 param`)) mustEqual `Ex 11 expected result`
+  }
 }
diff --git a/quill-sql/src/test/scala/io/getquill/context/sql/PeopleSpec.scala b/quill-sql/src/test/scala/io/getquill/context/sql/PeopleSpec.scala
@@ -8,7 +8,13 @@ trait PeopleSpec extends Spec {
 
   import context._
 
+  case class CustomInt(value: Int)
+
+  implicit lazy val customIntDecoder = MappedEncoding[CustomInt, Int](_.value)
+  implicit lazy val customIntEncoder = MappedEncoding[Int, CustomInt](x => CustomInt(x))
+
   case class Person(name: String, age: Int)
+  case class PersonWithCustomType(name: String, age: CustomInt)
   case class Couple(her: String, him: String)
 
   val peopleInsert =
@@ -131,6 +137,16 @@ trait PeopleSpec extends Spec {
         query[Person].filter(p => set.contains(p.age))
     }
 
+  def `Ex 11 contains`(set: Set[CustomInt]) =
+    quote {
+      querySchema[PersonWithCustomType]("public.Person").filter { p =>
+        if (liftQueryScalar(set).isEmpty)
+          true
+        else
+          liftQueryScalar(set).contains(p.age)
+      }
+    }
+
   val `Ex 8 param` = Set.empty[Int]
   val `Ex 8 expected result` = List.empty[Person]
 
@@ -145,4 +161,7 @@ trait PeopleSpec extends Spec {
     query[Person].sortBy(p => p.name)(Ord.asc).drop(3).take(3)
   }
   val `Ex 10 page 2 expected` = peopleEntries.sortBy(_.name).slice(3, 6)
+
+  val `Ex 11 param` = Set(CustomInt(55), CustomInt(33))
+  val `Ex 11 expected result` = List(PersonWithCustomType("Bert", CustomInt(55)), PersonWithCustomType("Cora", CustomInt(33)))
 }