Nested array support

alaisi · alaisi · commit ab118f911a2a · 2015-02-13T12:12:05.000+02:00
diff --git a/src/postgres/async/impl.clj b/src/postgres/async/impl.clj
@@ -17,16 +17,17 @@
   `(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 column->value [^Object value]
+  (if (or (nil? value)
+          (not (-> value .getClass .isArray)))
+    value
+    (vec (map column->value value))))
 
 (defn result->map [^ResultSet result]
   (let [columns (.getColumns result)
         row->map (fn [^PgRow row rowmap ^String col]
-            (assoc rowmap (keyword (.toLowerCase col)) (column->value row col)))]
+                   (assoc rowmap (keyword (.toLowerCase col))
+                          (column->value (.get 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
@@ -41,7 +41,10 @@
 (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]))))))
+      (is (= [1 2] (get-in rs [0 :a])))))
+  (testing "nested arrays are converted to vectors"
+    (let [rs (wait (<query! *db* ["select '{{1,2},{3,4},{5,NULL}}'::INT[][] as a"]))]
+      (is (= [[1 2] [3 4] [5 nil]] (get-in rs [0 :a]))))))
 
 (deftest inserts
   (testing "insert returns row count"
