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

Remove unused rsn

Browse source 
Since I changed the default multi-result-set format, the result set 
number is no longer needed.
This commit is contained in:
Sean Corfield 2020-06-24 12:25:25 -07:00
parent 2a8571bb14
commit 9d6e7ab145
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -681,9 +681,9 @@
(rest sql-params) (rest sql-params)
opts)] opts)]
(if (:multi-rs opts) (if (:multi-rs opts)
(loop [go (.execute stmt) acc [] rsn 0] (loop [go (.execute stmt) acc []]
(if-let [rs (stmt->result-set-update-count this stmt go opts)] (if-let [rs (stmt->result-set-update-count this stmt go opts)]
(recur (.getMoreResults stmt) (conj acc rs) (inc rsn)) (recur (.getMoreResults stmt) (conj acc rs))
acc)) acc))
(if-let [rs (stmt->result-set stmt opts)] (if-let [rs (stmt->result-set stmt opts)]
(datafiable-result-set rs this opts) (datafiable-result-set rs this opts)
@ -719,9 +719,9 @@
(rest sql-params) (rest sql-params)
opts)] opts)]
(if (:multi-rs opts) (if (:multi-rs opts)
(loop [go (.execute stmt) acc [] rsn 0] (loop [go (.execute stmt) acc []]
(if-let [rs (stmt->result-set-update-count this stmt go opts)] (if-let [rs (stmt->result-set-update-count this stmt go opts)]
(recur (.getMoreResults stmt) (conj acc rs) (inc rsn)) (recur (.getMoreResults stmt) (conj acc rs))
acc)) acc))
(if-let [rs (stmt->result-set stmt opts)] (if-let [rs (stmt->result-set stmt opts)]
(datafiable-result-set rs this opts) (datafiable-result-set rs this opts)
@ -746,10 +746,10 @@
{:next.jdbc/update-count (.getUpdateCount this)})) {:next.jdbc/update-count (.getUpdateCount this)}))
(-execute-all [this _ opts] (-execute-all [this _ opts]
(if (:multi-rs opts) (if (:multi-rs opts)
(loop [go (.execute this) acc [] rsn 0] (loop [go (.execute this) acc []]
(if-let [rs (stmt->result-set-update-count (if-let [rs (stmt->result-set-update-count
(.getConnection this) this go (assoc opts :return-keys true))] (.getConnection this) this go (assoc opts :return-keys true))]
(recur (.getMoreResults this) (conj acc rs) (inc rsn)) (recur (.getMoreResults this) (conj acc rs))
acc)) acc))
(if-let [rs (stmt->result-set this (assoc opts :return-keys true))] (if-let [rs (stmt->result-set this (assoc opts :return-keys true))]
(datafiable-result-set rs (.getConnection this) opts) (datafiable-result-set rs (.getConnection this) opts)
@ -780,10 +780,10 @@
(assert (= 1 (count sql-params)) (assert (= 1 (count sql-params))
"Parameters cannot be provided when executing a non-prepared Statement") "Parameters cannot be provided when executing a non-prepared Statement")
(if (:multi-rs opts) (if (:multi-rs opts)
(loop [go (.execute this (first sql-params)) acc [] rsn 0] (loop [go (.execute this (first sql-params)) acc []]
(if-let [rs (stmt->result-set-update-count (if-let [rs (stmt->result-set-update-count
(.getConnection this) this go (assoc opts :return-keys true))] (.getConnection this) this go (assoc opts :return-keys true))]
(recur (.getMoreResults this) (conj acc rs) (inc rsn)) (recur (.getMoreResults this) (conj acc rs))
acc)) acc))
(if-let [rs (stmt-sql->result-set this (first sql-params))] (if-let [rs (stmt-sql->result-set this (first sql-params))]
(datafiable-result-set rs (.getConnection this) opts) (datafiable-result-set rs (.getConnection this) opts)