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

Restore :identifiers functionality

Browse source
This commit is contained in:
Sean Corfield 2019-03-30 23:31:35 -07:00
parent 2cb3c20122
commit 4d41faa8cd
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/next/jdbc.clj
View file

@ -359,13 +359,19 @@
(defn- get-column-names (defn- get-column-names
"" ""
[^ResultSet rs] [^ResultSet rs opts]
(let [^ResultSetMetaData rsmeta (.getMetaData rs) (let [^ResultSetMetaData rsmeta (.getMetaData rs)
idxs (range 1 (inc (.getColumnCount rsmeta)))] idxs (range 1 (inc (.getColumnCount rsmeta)))]
(mapv (fn [^Integer i] (if-let [ident-fn (:identifiers opts)]
(keyword (not-empty (.getTableName rsmeta i)) (mapv (fn [^Integer i]
(.getColumnLabel rsmeta i))) (keyword (when-let [qualifier (not-empty (.getTableName rsmeta i))]
idxs))) (ident-fn qualifier))
(ident-fn (.getColumnLabel rsmeta i))))
idxs)
(mapv (fn [^Integer i]
(keyword (not-empty (.getTableName rsmeta i))
(.getColumnLabel rsmeta i)))
idxs))))
(defn- mapify-result-set (defn- mapify-result-set
"Given a result set, return an object that wraps the current row as a hash "Given a result set, return an object that wraps the current row as a hash
@ -378,8 +384,8 @@
a full row will be realized (via seq/into). a full row will be realized (via seq/into).
Supports Seqable which realizes a full row of the data." Supports Seqable which realizes a full row of the data."
[^ResultSet rs] [^ResultSet rs opts]
(let [cols (delay (get-column-names rs))] (let [cols (delay (get-column-names rs opts))]
(reify (reify
clojure.lang.ILookup clojure.lang.ILookup
@ -416,14 +422,14 @@
(defn- reduce-stmt (defn- reduce-stmt
"" ""
[^PreparedStatement stmt f init try-generated-keys?] [^PreparedStatement stmt f init opts]
(if-let [^ResultSet rs (if (.execute stmt) (if-let [^ResultSet rs (if (.execute stmt)
(.getResultSet stmt) (.getResultSet stmt)
(when try-generated-keys? (when (:return-keys opts)
(try (try
(.getGeneratedKeys stmt) (.getGeneratedKeys stmt)
(catch Exception _))))] (catch Exception _))))]
(let [rs-map (mapify-result-set rs)] (let [rs-map (mapify-result-set rs opts)]
(loop [init' init] (loop [init' init]
(if (.next rs) (if (.next rs)
(let [result (f init' rs-map)] (let [result (f init' rs-map)]
@ -435,27 +441,34 @@
(extend-protocol Executable (extend-protocol Executable
Connection Connection
(-execute [this [sql & params] opts] (-execute [this sql-params opts]
(let [factory (pre-prepare* opts)] (let [factory (pre-prepare* opts)]
(reify clojure.lang.IReduceInit (reify clojure.lang.IReduceInit
(reduce [_ f init] (reduce [_ f init]
(with-open [stmt (prepare-fn* this sql params factory)] (with-open [stmt (prepare-fn* this
(reduce-stmt stmt f init (:return-keys opts))))))) (first sql-params)
(rest sql-params)
factory)]
(reduce-stmt stmt f init opts))))))
DataSource DataSource
(-execute [this [sql & params] opts] (-execute [this sql-params opts]
(let [factory (pre-prepare* opts)] (let [factory (pre-prepare* opts)]
(reify clojure.lang.IReduceInit (reify clojure.lang.IReduceInit
(reduce [_ f init] (reduce [_ f init]
(with-open [con (get-connection this opts)] (with-open [con (get-connection this opts)]
(with-open [stmt (prepare-fn* con sql params factory)] (with-open [stmt (prepare-fn* con
(reduce-stmt stmt f init (:return-keys opts)))))))) (first sql-params)
(rest sql-params)
factory)]
(reduce-stmt stmt f init opts)))))))
PreparedStatement PreparedStatement
(-execute [this _ _] (-execute [this _ opts]
(reify clojure.lang.IReduceInit (reify clojure.lang.IReduceInit
;; we can't tell if this PreparedStatement will return generated ;; we can't tell if this PreparedStatement will return generated
;; keys so we pass a truthy value to at least attempt it if we ;; keys so we pass a truthy value to at least attempt it if we
;; do not get a ResultSet back from the execute call ;; do not get a ResultSet back from the execute call
(reduce [_ f init] (reduce-stmt this f init :maybe-keys)))) (reduce [_ f init]
(reduce-stmt this f init (assoc opts :return-keys true)))))
Object Object
(-execute [this sql-params opts] (-execute [this sql-params opts]
(-execute (get-datasource this) sql-params opts))) (-execute (get-datasource this) sql-params opts)))
@ -568,6 +581,7 @@
(execute-one! con (execute-one! con
["select * from fruit where appearance = ?" "red"] ["select * from fruit where appearance = ?" "red"]
{:row-fn #(assoc % :test :value)}) {:row-fn #(assoc % :test :value)})
;; test assoc works ;; test assoc works
(execute! con (execute! con
["select * from fruit where appearance = ?" "red"] ["select * from fruit where appearance = ?" "red"]
@ -576,9 +590,4 @@
(with-transaction [t con {:rollback-only? true}] (with-transaction [t con {:rollback-only? true}]
(execute! t ["INSERT INTO fruit (id,name,appearance,cost,grade) VALUES (5,'Pear','green',49,47)"]) (execute! t ["INSERT INTO fruit (id,name,appearance,cost,grade) VALUES (5,'Pear','green',49,47)"])
(execute! t ["select * from fruit where name = ?" "Pear"])) (execute! t ["select * from fruit where name = ?" "Pear"]))
(execute! con ["select * from fruit where name = ?" "Pear"]) (execute! con ["select * from fruit where name = ?" "Pear"]))
(require '[clojure.java.jdbc :as j])
(j/insert! db-spec :fruit {:id 6, :name "Kiwi", :appearance "Hairy", :cost 99, :grade 66.6})
(require '[compliment.core]))