Add unsweetened func query term

Author: rplevy

src/rethinkdb/query.cljc

@@ -21,11 +21,23 @@
   #?(:clj
      (:import [rethinkdb.core Connection])))
 
+(defn func
+  "Unsweetened alternative to fn. The fn macro has the benefit of
+  providing a syntax that mirrors the native clojure fn, but
+  oftentimes it's necessary to have the added versatility of a
+  definition that accepts pure data.
+
+  Args is a vector of keywords. Terms is a term map.
+  e.g. (func [::my-arg] terms)"
+  [args terms]
+  (term :FUNC [args terms]))
+
 #?(:clj (defmacro fn [args & [body]]
-          (let [new-args (into [] (clojure.core/map #(hash-map :temp-var (keyword %)) args))
+          (let [new-args (into [] (clojure.core/map
+                                   #(hash-map :temp-var (keyword %)) args))
                 new-replacements (zipmap args new-args)
                 new-terms (walk/postwalk-replace new-replacements body)]
-            (term :FUNC [new-args new-terms]))))
+            (func new-args new-terms))))
 
 ;;; Import connect
 

test/rethinkdb/core_test.clj

@@ -303,6 +303,25 @@
                                                 x)))})))
                   conn)))))
 
+(deftest unsweetened-fns
+  (with-open [conn (r/connect)]
+    (is (= [{:a {:foo "bar"}
+             :b [1 2]}]
+           (r/run (-> [{:foo "bar"}]
+                      (r/map (r/func [::x]
+                               {:a ::x
+                                :b (-> [1 2]
+                                       (r/map (r/func [::x] ::x)))})))
+                  conn)))
+    (is (= [{:a {:foo "bar"}
+             :b [{:foo "bar"} {:foo "bar"}]}]
+           (r/run (-> [{:foo "bar"}]
+                      (r/map (r/func [::x]
+                               {:a ::x
+                                :b (-> [1 2]
+                                       (r/map (r/func [::y] ::x)))})))
+                  conn)))))
+
 (deftest filter-with-default
   (with-open [conn (r/connect)]
     (let [twin-peaks [{:name "Cole", :job "Regional Bureau Chief"}