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

Restore opts/:return-keys optimization for stmt-sql

Browse source
This commit is contained in:
Sean Corfield 2020-06-26 22:47:44 -07:00
parent 217621cb1c
commit eb5bfef585
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -662,12 +662,13 @@
"Given a `Statement`, a SQL command, execute it and return a
`ResultSet` if possible. We always attempt to return keys."
^ResultSet
[^Statement stmt ^String sql]
[^Statement stmt ^String sql opts]
(if (.execute stmt sql)
(.getResultSet stmt)
(try
(.getGeneratedKeys stmt)
(catch Exception _))))
(when (:return-keys opts)
(try
(.getGeneratedKeys stmt)
(catch Exception _)))))
(defn- reduce-stmt-sql
"Execute the SQL command on the given `Statement`, attempt to get either
@ -678,7 +679,7 @@
a hash map containing `:next.jdbc/update-count` and the number of rows
updated, with the supplied function and initial value applied."
[^Statement stmt sql f init opts]
(if-let [rs (stmt-sql->result-set stmt sql)]
(if-let [rs (stmt-sql->result-set stmt sql opts)]
(let [rs-map (mapify-result-set rs opts)]
(loop [init' init]
(if (.next rs)
@ -698,7 +699,7 @@
a hash map containing `:next.jdbc/update-count` and the number of rows
updated, and fold that as a single element collection."
[^Statement stmt sql n combinef reducef connectable opts]
(if-let [rs (stmt-sql->result-set stmt sql)]
(if-let [rs (stmt-sql->result-set stmt sql opts)]
(let [rs-map (mapify-result-set rs opts)
chunk (fn [batch] (#'r/fjtask #(r/reduce reducef (combinef) batch)))
realize (fn [row] (datafiable-row row connectable opts))]