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

Merge pull request #206 from rschmukler/rs/hash-map-and-batch-multi-insert

Browse source 
insert-multi! hashmap support + batch mode
This commit is contained in:
Sean Corfield 2022-05-20 11:18:10 -07:00 committed by GitHub
commit 68cff61e94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 99 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/next/jdbc/specs.clj
View file

@ -180,16 +180,26 @@
:opts (s/? ::opts-map)))
(s/fdef sql/insert-multi!
:args (s/and (s/cat :connectable ::connectable
:table keyword?
:cols (s/coll-of keyword?
:kind sequential?
:min-count 1)
:rows (s/coll-of (s/coll-of any? :kind sequential?)
:kind sequential?)
:opts (s/? ::opts-map))
#(apply = (count (:cols %))
(map count (:rows %)))))
:args
(s/or
:with-rows-and-columns
(s/and (s/cat :connectable ::connectable
:table keyword?
:cols (s/coll-of keyword?
:kind sequential?
:min-count 1)
:rows (s/coll-of (s/coll-of any? :kind sequential?)
:kind sequential?)
:opts (s/? ::opts-map))
#(apply = (count (:cols %))
(map count (:rows %))))
:with-hash-maps
(s/cat :connectable ::connectable
:table keyword?
:hash-maps (s/coll-of map?
:kind sequential?
:min-count 1)
:opts (s/? ::opts-map))))
(s/fdef sql/query
:args (s/cat :connectable ::connectable

41
src/next/jdbc/sql.clj
View file

@ -21,7 +21,7 @@
In addition, `find-by-keys` supports `:order-by` to add an `ORDER BY`
clause to the generated SQL."
(:require [next.jdbc :refer [execute! execute-one!]]
(:require [next.jdbc :refer [execute! execute-one! execute-batch!]]
[next.jdbc.sql.builder
:refer [for-delete for-insert for-insert-multi
for-query for-update]]))
@ -50,18 +50,41 @@
multiple rows in the database and attempts to return a vector of maps of
generated keys.
Note: this expands to a single SQL statement with placeholders for every
value being inserted -- for large sets of rows, this may exceed the limits
Also supports a sequence of hash maps with keys corresponding to column
names.
If called with `:batch` true will call `execute-batch!` - see its documentation
for situations in which the generated keys may or may not be returned as well as
additional options that can be passed.
Note: without `:batch` this expands to a single SQL statement with placeholders for
every value being inserted -- for large sets of rows, this may exceed the limits
on SQL string size and/or number of parameters for your JDBC driver or your
database!"
([connectable table cols rows]
(insert-multi! connectable table cols rows {}))
{:arglists '([connectable table hash-maps]
[connectable table hash-maps opts]
[connectable table cols rows]
[connectable table cols rows opts])}
([connectable table hash-maps]
(insert-multi! connectable table hash-maps {}))
([connectable table hash-maps-or-cols opts-or-rows]
(if-not (-> hash-maps-or-cols first map?)
(insert-multi! connectable table hash-maps-or-cols opts-or-rows {})
(let [cols (keys (first hash-maps-or-cols))
->row (fn ->row [m]
(map (partial get m) cols))]
(insert-multi! connectable table cols (map ->row hash-maps-or-cols) opts-or-rows))))
([connectable table cols rows opts]
(if (seq rows)
(let [opts (merge (:options connectable) opts)]
(execute! connectable
(for-insert-multi table cols rows opts)
(merge {:return-keys true} opts)))
(let [opts (merge (:options connectable) opts)
batch? (:batch opts)]
(if batch?
(let [[sql & param-groups] (for-insert-multi table cols rows opts)]
(execute-batch! connectable sql param-groups
(merge {:return-keys true :return-generated-keys true} opts)))
(execute! connectable
(for-insert-multi table cols rows opts)
(merge {:return-keys true} opts))))
[])))
(defn query

9
src/next/jdbc/sql/builder.clj
View file

@ -137,6 +137,10 @@
Applies any `:table-fn` / `:column-fn` supplied in the options.
If `:batch` is set to `true` in `opts` the INSERT statement will be prepared
using a single set of placeholders and remaining parameters in the vector will
be grouped at the row level.
If `:suffix` is provided in `opts`, that string is appended to the
`INSERT ...` statement."
[table cols rows opts]
@ -147,15 +151,16 @@
(assert (seq rows) "rows may not be empty")
(let [table-fn (:table-fn opts identity)
column-fn (:column-fn opts identity)
batch? (:batch opts)
params (str/join ", " (map (comp column-fn name) cols))
places (as-? (first rows) opts)]
(into [(str "INSERT INTO " (table-fn (safe-name table))
" (" params ")"
" VALUES "
(str/join ", " (repeat (count rows) (str "(" places ")")))
(str/join ", " (repeat (if batch? 1 (count rows)) (str "(" places ")")))
(when-let [suffix (:suffix opts)]
(str " " suffix)))]
cat
(if batch? identity cat)
rows)))
(defn for-order-col

12
test/next/jdbc/sql/builder_test.clj
View file

@ -146,11 +146,19 @@
{:id 9 :status 42 :opt nil}
{:table-fn sql-server :column-fn mysql})
["INSERT INTO [user] (`id`, `status`, `opt`) VALUES (?, ?, ?)" 9 42 nil])))
(testing "multi-row insert"
(testing "multi-row insert (normal mode)"
(is (= (builder/for-insert-multi :user
[:id :status]
[[42 "hello"]
[35 "world"]
[64 "dollars"]]
{:table-fn sql-server :column-fn mysql})
["INSERT INTO [user] (`id`, `status`) VALUES (?, ?), (?, ?), (?, ?)" 42 "hello" 35 "world" 64 "dollars"]))))
["INSERT INTO [user] (`id`, `status`) VALUES (?, ?), (?, ?), (?, ?)" 42 "hello" 35 "world" 64 "dollars"])))
(testing "multi-row insert (batch mode)"
(is (= (builder/for-insert-multi :user
[:id :status]
[[42 "hello"]
[35 "world"]
[64 "dollars"]]
{:table-fn sql-server :column-fn mysql :batch true})
["INSERT INTO [user] (`id`, `status`) VALUES (?, ?)" [42 "hello"] [35 "world"] [64 "dollars"]]))))

30
test/next/jdbc/sql_test.clj
View file

@ -152,6 +152,36 @@
(is (= {:next.jdbc/update-count 2}
(sql/delete! (ds) :fruit ["id > ?" 4])))
(is (= 4 (count (sql/query (ds) ["select * from fruit"])))))
(testing "multiple insert/delete with maps"
(is (= (cond (derby?)
[nil] ; WTF Apache Derby?
(mssql?)
[14M]
(sqlite?)
[14]
:else
[12 13 14])
(mapv new-key
(sql/insert-multi! (ds) :fruit
[{:name "Kiwi"
:appearance "green & fuzzy"
:cost 100
:grade 99.9}
{:name "Grape"
:appearance "black"
:cost 10
:grade 50}
{:name "Lemon"
:appearance "yellow"
:cost 20
:grade 9.9}]))))
(is (= 7 (count (sql/query (ds) ["select * from fruit"]))))
(is (= {:next.jdbc/update-count 1}
(sql/delete! (ds) :fruit {:id 12})))
(is (= 6 (count (sql/query (ds) ["select * from fruit"]))))
(is (= {:next.jdbc/update-count 2}
(sql/delete! (ds) :fruit ["id > ?" 10])))
(is (= 4 (count (sql/query (ds) ["select * from fruit"])))))
(testing "empty insert-multi!" ; per #44
(is (= [] (sql/insert-multi! (ds) :fruit
[:name :appearance :cost :grade]