Use alternate column syntax in update

alaisi · alaisi · commit 5d28b3941789 · 2014-09-06T12:43:28.000+03:00
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Asynchronous PostgreSQL Clojure library
 (<!! (<update! db {:table "users" :where ["id=$1" 1001}} {:price 6}))
 ; [{:updated 1, :rows []} nil]
 
-(<!! (<execute! d ["select 1 as anything"]))
+(<!! (<execute! db ["select 1 as anything"]))
 ; [{:updated 0, :rows [{:anything 1}]} nil]
 
 ;; Asynchronous composition! dosql returns [nil exception] on first error
diff --git a/src/clj_postgres_async/core.clj b/src/clj_postgres_async/core.clj
@@ -59,13 +59,17 @@
           f))
 
 (defn- create-update-sql [spec data]
-  (let [where  (:where spec)
+  (let [where (:where spec)
         cols   (for [e data] (-> e (first) (name)))
-        params (range (count where) (+ (count where) (count data)))]
+        params (for [i (range (count where) (+ (count where) (count data)))]
+                 (str "$" i))
+        ret   (:returning spec)]
     (str "UPDATE " (:table spec)
-         " SET "   (string/join ", " (map #(str (first %1) " = $" (second %1))
-                                          (partition 2 (interleave cols params))))
-         " WHERE " (first where))))
+         " SET (" (string/join "," cols)
+         ")=(" (string/join "," params) ")"
+         " WHERE " (first where)
+         (when ret
+           (str " RETURNING " ret)))))
 
 (defn update! [db spec data f]
   (execute! db (flatten [(create-update-sql spec data)
diff --git a/test/clj_postgres_async/core_test.clj b/test/clj_postgres_async/core_test.clj
@@ -17,20 +17,36 @@
                            :username (env "PG_USER" "postgres")
                            :password (env "PG_PASSWORD" "postgres")
                            :pool-size 1})]
-    (try (f)
-         (finally (close-db! *db*)))))
+    (try
+      (let [[_ err] (<!! (go (dosql
+                              [_ (<execute! *db* ["drop table if exists clj_pg_test"])
+                               _ (<execute! *db* ["create table clj_pg_test (
+                                              id serial, t varchar(10)
+                                            )"])])))]
+        (if err
+          (throw err)
+          (f)))
+      (finally (close-db! *db*)))))
 
 (use-fixtures :each db-fixture)
 
 (deftest queries
   (testing "<query! returns rows as map"
-    (is (= [[{:x 1}] nil]
-           (<!! (<query! *db* ["select 1 as x"]))))))
+    (let [[rs err] (<!! (<query! *db* ["select 1 as x"]))]
+      (is (= 1 (get-in rs [0 :x]))))))
+
+(deftest inserts
+  (testing "insert return row count"
+    (let [[rs err] (<!! (<insert! *db* {:table "clj_pg_test"} {:t "x"}))]
+      (is (= 1 (:updated rs)))))
+  (testing "insert with returning returns generated keys"
+    (let [[rs err] (<!! (<insert! *db* {:table "clj_pg_test" :returning "id"} {:t "y"}))]
+      (is (get-in rs [:rows 0 :id])))))
 
 (deftest sql-macro
   (testing "dosql returns last form"
     (is (= ["123" nil]
-           (<!! (go
-                 (dosql [rs (<query! *db* ["select 123 as x"])
-                         rs (<query! *db* ["select $1::text as t" (:x (first rs))])]
-                        (:t (first rs)))))))))
+           (<!! (go (dosql
+                     [rs (<query! *db* ["select 123 as x"])
+                      rs (<query! *db* ["select $1::text as t" (:x (first rs))])]
+                     (:t (first rs)))))))))
