Convert arrays to vecs

alaisi · alaisi · commit 5c818bbb1b44 · 2015-02-13T09:54:35.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,7 @@ pom.xml
 pom.xml.asc
 *.jar
 *.class
+*.iml
+/.idea
 /.lein-*
 /.nrepl-port
diff --git a/project.clj b/project.clj
@@ -7,6 +7,6 @@
         :url "http://github.com/alaisi/postgres.async.git"}
   :dependencies [[org.clojure/clojure "1.6.0"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
-                 [com.github.alaisi.pgasync/postgres-async-driver "0.3"]]
+                 [com.github.alaisi.pgasync/postgres-async-driver "0.4-SNAPSHOT"]]
   :global-vars {*warn-on-reflection* true}
   :target-path "target/%s")
diff --git a/src/postgres/async/impl.clj b/src/postgres/async/impl.clj
@@ -17,10 +17,16 @@
   `(reify Consumer (accept [_# ~param]
                      (~@body))))
 
+(defn column->value [^PgRow row ^String col]
+  (let [r (.get row col)]
+    (if (-> r .getClass .isArray)
+      (vec r)
+      r)))
+
 (defn result->map [^ResultSet result]
   (let [columns (.getColumns result)
         row->map (fn [^PgRow row rowmap ^String col]
-            (assoc rowmap (keyword (.toLowerCase col)) (.get row col)))]
+            (assoc rowmap (keyword (.toLowerCase col)) (column->value row col)))]
     {:updated (.updatedRows result)
      :rows (vec (map (fn [row]
                            (reduce (partial row->map row) {} columns))
diff --git a/test/postgres/async_test.clj b/test/postgres/async_test.clj
@@ -38,6 +38,11 @@
     (let [rs (wait (<query! *db* ["select 1 as x"]))]
       (is (= 1 (get-in rs [0 :x]))))))
 
+(deftest query-for-array
+  (testing "arrays are converted to vectors"
+    (let [rs (wait (<query! *db* ["select '{1,2}'::INT[] as a"]))]
+      (is (= [1 2] (get-in rs [0 :a]))))))
+
 (deftest inserts
   (testing "insert returns row count"
     (let [rs (wait (<insert! *db* {:table table} {:t "x"}))]
