gered/views.honeysql
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use a more unique keyword name to hold hints in a view transaction

Browse source
This commit is contained in:
Gered 2016-05-21 16:31:14 -04:00
parent 2506440c6f
commit 2f5d432440
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/honeysql/core.clj
View file

@ -12,11 +12,11 @@
"Like jdbc's with-db-transaction, but sends view hints at end of transaction." "Like jdbc's with-db-transaction, but sends view hints at end of transaction."
[binding & forms] [binding & forms]
(let [tvar (first binding), db (second binding), args (drop 2 binding)] (let [tvar (first binding), db (second binding), args (drop 2 binding)]
`(if (:hints ~db) ;; check if we are in a nested transaction `(if (:views-honeysql/hints ~db) ;; check if we are in a nested transaction
(let [~tvar ~db] ~@forms) (let [~tvar ~db] ~@forms)
(let [hints# (atom []) (let [hints# (atom [])
result# (j/with-db-transaction [t# ~db ~@args] result# (j/with-db-transaction [t# ~db ~@args]
(let [~tvar (assoc ~db :hints hints#)] (let [~tvar (assoc ~db :views-honeysql/hints hints#)]
~@forms))] ~@forms))]
(put-hints! @hints#) (put-hints! @hints#)
result#)))) result#))))
@ -40,7 +40,7 @@
([db namespace action-map] ([db namespace action-map]
(let [results (execute-honeysql! db action-map) (let [results (execute-honeysql! db action-map)
hsql-hint (hint namespace (query-tables action-map) hint-type)] hsql-hint (hint namespace (query-tables action-map) hint-type)]
(if-let [hints (:hints db)] (if-let [hints (:views-honeysql/hints db)]
(swap! hints conj hsql-hint) (swap! hints conj hsql-hint)
(put-hints! [hsql-hint])) (put-hints! [hsql-hint]))
results)) results))