🐛 Pass correct default options on db/plan fn

This commit is contained in:
Andrey Antukh 2025-01-20 23:15:33 +01:00
parent 141694dc8d
commit 066b1235a6
3 changed files with 10 additions and 11 deletions

View file

@ -270,19 +270,17 @@
:else (throw (IllegalArgumentException. "unable to resolve connectable")))) :else (throw (IllegalArgumentException. "unable to resolve connectable"))))
(def ^:private params-mapping (def ^:private params-mapping
{::return-keys? :return-keys {::return-keys :return-keys})
::return-keys :return-keys})
(defn rename-opts (defn rename-opts
[opts] [opts]
(set/rename-keys opts params-mapping)) (set/rename-keys opts params-mapping))
(def ^:private default-insert-opts (def ^:private default-insert-opts
{:builder-fn sql/as-kebab-maps (assoc sql/default-opts :return-keys true))
:return-keys true})
(def ^:private default-opts (def ^:private default-opts
{:builder-fn sql/as-kebab-maps}) sql/default-opts)
(defn exec! (defn exec!
([ds sv] (exec! ds sv nil)) ([ds sv] (exec! ds sv nil))
@ -333,7 +331,7 @@
(defn update! (defn update!
"A helper that build an UPDATE SQL statement and executes it. "A helper that build an UPDATE SQL statement and executes it.
Given a connectable object, a table name, a hash map of columns and Given a connectable object, a table name, a hash map of columns and
values to set, and either a hash map of columns and values to search values to set, and either a hash map of columns and values to search
on or a vector of a SQL where clause and parameters, perform an on or a vector of a SQL where clause and parameters, perform an
update on the table. update on the table.

View file

@ -15,14 +15,15 @@
(defn kebab-case [s] (str/replace s #"_" "-")) (defn kebab-case [s] (str/replace s #"_" "-"))
(defn snake-case [s] (str/replace s #"-" "_")) (defn snake-case [s] (str/replace s #"-" "_"))
(def default-opts
{:table-fn snake-case
:column-fn snake-case})
(defn as-kebab-maps (defn as-kebab-maps
[rs opts] [rs opts]
(jdbc-opt/as-unqualified-modified-maps rs (assoc opts :label-fn kebab-case))) (jdbc-opt/as-unqualified-modified-maps rs (assoc opts :label-fn kebab-case)))
(def default-opts
{:table-fn snake-case
:column-fn snake-case
:builder-fn as-kebab-maps})
(defn insert (defn insert
([table key-map] ([table key-map]
(insert table key-map nil)) (insert table key-map nil))

View file

@ -67,7 +67,7 @@
:is-owner true :is-owner true
:is-admin true :is-admin true
:can-edit true} :can-edit true}
{::db/return-keys? false})) {::db/return-keys false}))
(doseq [params (sequence (comp (doseq [params (sequence (comp
(map #(bfc/remap-id % :file-id)) (map #(bfc/remap-id % :file-id))