luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add row builder tests; fix row builder bug in execute-one

Browse source
This commit is contained in:
Sean Corfield 2019-04-18 23:03:09 -07:00
parent d5ee7defd9
commit bfda745a70
2 changed files with 51 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/next/jdbc/result_set.clj
View file

@ -307,8 +307,10 @@
(rest sql-params)
opts)]
(if-let [rs (stmt->result-set stmt opts)]
(when (.next rs)
(datafiable-row (row-builder (as-maps rs opts)) this opts))
(let [gen-fn (get opts :gen-fn as-maps)
gen (gen-fn rs opts)]
(when (.next rs)
(datafiable-row (row-builder gen) this opts)))
{:next.jdbc/update-count (.getUpdateCount stmt)}))))
(-execute-all [this sql-params opts]
(with-open [con (p/get-connection this opts)]

58
test/next/jdbc/result_set_test.clj
View file

@ -7,29 +7,30 @@
* column name generation functions
* ReadableColumn protocol extension point
* RowBuilder and ResultSetBuilder machinery
* datafy/nav support
* ResultSet-as-map for reducible! / -execute protocol
* -execute-one and -execute-all implementations"
(:require [clojure.datafy :as d]
[clojure.string :as str]
[clojure.test :refer [deftest is testing use-fixtures]]
[next.jdbc.test-fixtures :refer [with-test-db ds]]
[next.jdbc.result-set :as rs]))
[next.jdbc.protocols :as p]
[next.jdbc.result-set :as rs]
[next.jdbc.test-fixtures :refer [with-test-db ds]]))
(use-fixtures :once with-test-db)
(deftest test-datafy-nav
(testing "default schema"
(let [connectable (ds)
test-row (rs/datafiable-row {:table/fruit_id 2} connectable {})
test-row (rs/datafiable-row {:table/fruit_id 1} connectable {})
data (d/datafy test-row)
v (get data :table/fruit_id)]
;; check datafication is sane
(is (= 2 v))
(is (= 1 v))
(let [object (d/nav data :table/fruit_id v)]
;; check nav produces a single map with the expected key/value data
;; and remember H2 is all UPPERCASE!
(is (= 2 (:FRUIT/ID object)))
(is (= "Banana" (:FRUIT/NAME object))))))
(is (= 1 (:FRUIT/ID object)))
(is (= "Apple" (:FRUIT/NAME object))))))
(testing "custom schema :one"
(let [connectable (ds)
test-row (rs/datafiable-row {:foo/bar 2} connectable
@ -45,15 +46,50 @@
(is (= "Banana" (:FRUIT/NAME object))))))
(testing "custom schema :many"
(let [connectable (ds)
test-row (rs/datafiable-row {:foo/bar 2} connectable
test-row (rs/datafiable-row {:foo/bar 3} connectable
{:schema {:foo/bar [:fruit :id :many]}})
data (d/datafy test-row)
v (get data :foo/bar)]
;; check datafication is sane
(is (= 2 v))
(is (= 3 v))
(let [object (d/nav data :foo/bar v)]
;; check nav produces a result set with the expected key/value data
;; and remember H2 is all UPPERCASE!
(is (vector? object))
(is (= 2 (:FRUIT/ID (first object))))
(is (= "Banana" (:FRUIT/NAME (first object))))))))
(is (= 3 (:FRUIT/ID (first object))))
(is (= "Peach" (:FRUIT/NAME (first object))))))))
(defn get-lower-column-names [^java.sql.ResultSetMetaData rsmeta opts]
(let [idxs (range 1 (inc (.getColumnCount rsmeta)))]
(mapv (fn [^Integer i]
(keyword (str/lower-case (.getColumnLabel rsmeta i))))
idxs)))
(defn as-lower-maps [^java.sql.ResultSet rs opts]
(let [rsmeta (.getMetaData rs)
cols (get-lower-column-names rsmeta opts)]
(rs/->MapResultSetBuilder rs rsmeta cols)))
(deftest test-map-row-builder
(testing "default row builder"
(let [row (p/-execute-one (ds)
["select * from fruit where id = ?" 1]
{})]
(is (map? row))
(is (= 1 (:FRUIT/ID row)))
(is (= "Apple" (:FRUIT/NAME row)))))
(testing "unqualified row builder"
(let [row (p/-execute-one (ds)
["select * from fruit where id = ?" 2]
{:gen-fn rs/as-unqualified-maps})]
(is (map? row))
(is (= 2 (:ID row)))
(is (= "Banana" (:NAME row)))))
(testing "lower-case row builder"
(let [row (p/-execute-one (ds)
["select * from fruit where id = ?" 3]
{:gen-fn as-lower-maps})]
(is (map? row))
(is (= 3 (:id row)))
(is (= "Peach" (:name row))))))