📎 Normalize default opts for db/plan function

This commit is contained in:
Andrey Antukh 2025-01-20 23:21:41 +01:00
parent 066b1235a6
commit da0704081f
2 changed files with 11 additions and 10 deletions

View file

@ -411,13 +411,20 @@
:hint "database object not found"))
row))
(def ^:private default-plan-opts
(-> default-opts
(assoc :fetch-size 1)
(assoc :concurrency :read-only)
(assoc :cursors :close)
(assoc :result-type :forward-only)))
(defn plan
([ds sql]
(-> (get-connectable ds)
(jdbc/plan sql default-opts)))
(jdbc/plan sql default-plan-opts)))
([ds sql opts]
(-> (get-connectable ds)
(jdbc/plan sql (merge default-opts opts)))))
(jdbc/plan sql (merge default-plan-opts opts)))))
(defn cursor
"Return a lazy seq of rows using server side cursors"

View file

@ -56,12 +56,6 @@
(map :data)
(mapcat bfc/collect-used-media)))
(def ^:private plan-opts
{:fetch-size 1
:concurrency :read-only
:cursors :close
:result-type :forward-only})
(defn- clean-file-media!
"Performs the garbage collection of file media objects."
[{:keys [::db/conn] :as cfg} {:keys [id] :as file}]
@ -69,7 +63,7 @@
(map (partial decode-file cfg))
xf:collect-used-media)
used (->> (db/plan conn [sql:get-snapshots id] plan-opts)
used (->> (db/plan conn [sql:get-snapshots id])
(transduce xform conj #{}))
used (into used xf:collect-used-media [file])
@ -175,7 +169,7 @@
(mapcat (partial get-used-components deleted-components file-id))
used-remote
(->> (db/plan conn [sql:get-files-for-library file-id] plan-opts)
(->> (db/plan conn [sql:get-files-for-library file-id])
(transduce (comp (map (partial decode-file cfg)) xform) conj #{}))
used-local