transforms should handle [:in <field> <set>] (#45)

camsaul · Jan 4, 2023 · 6241460 · 6241460
1 parent a539c38
commit 6241460
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/toucan2/tools/transformed.clj b/src/toucan2/tools/transformed.clj
@@ -72,7 +72,8 @@
     (sequential? v)
     (into [(first v)]
           (map (fn xform* [v]
-                 (if (sequential? v)
+                 (if (or (sequential? v)
+                         (set? v))
                    (mapv xform* v)
                    (xform v))))
           (rest v))

diff --git a/test/toucan2/tools/transformed_test.clj b/test/toucan2/tools/transformed_test.clj
@@ -54,18 +54,17 @@
               {:id 2, :name "Ho's Tavern", :category :bar}]
              (select/select ::venues.category-keyword :category :bar {:select   [:id :name :category]
                                                                       :order-by [[:id :asc]]})))
-      (testing "Toucan-style [f & args] condition"
-        (is (= [{:id 1, :name "Tempest", :category :bar}
-                {:id 2, :name "Ho's Tavern", :category :bar}]
-               (select/select ::venues.category-keyword :category [:= :bar]
-                              {:select   [:id :name :category]
-                               :order-by [[:id :asc]]})
-               (select/select ::venues.category-keyword :category [:in [:bar]]
-                              {:select   [:id :name :category]
-                               :order-by [[:id :asc]]})
-               (select/select ::venues.category-keyword :category [:in [:bar :saloon]]
-                              {:select   [:id :name :category]
-                               :order-by [[:id :asc]]})))))
+      (testing "Toucan-style [f & args] condition\n"
+        (are [condition] (= [{:id 1, :name "Tempest", :category :bar}
+                             {:id 2, :name "Ho's Tavern", :category :bar}]
+                            (select/select ::venues.category-keyword :category condition
+                                           {:select   [:id :name :category]
+                                            :order-by [[:id :asc]]}))
+          [:= :bar]
+          [:in [:bar]]
+          [:in [:bar :saloon]]
+          [:in #{:bar :saloon}]
+          [:in (list :bar :saloon)])))
     (testing "as the PK"
       (testing "(single value)"
         (is (= [{:id "1", :name "Tempest", :category :bar}]