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

updates for recent views changes

Browse source
This commit is contained in:
Gered 2016-05-29 19:01:36 -04:00
parent 9de07f22ef
commit 4a3916d25f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,6 @@
(ns views.honeysql.core (ns views.honeysql.core
(:import
(clojure.lang Atom))
(:require (:require
[views.core :refer [view-system hint put-hints!]] [views.core :refer [view-system hint put-hints!]]
[views.honeysql.util :refer [query-tables]] [views.honeysql.util :refer [query-tables]]
@ -13,7 +15,7 @@
vexec! calls which need to be run in a transaction. Holds all view system hints vexec! calls which need to be run in a transaction. Holds all view system hints
generated by any vexec! calls within the transaction until the end, at which point generated by any vexec! calls within the transaction until the end, at which point
they are all sent to the view system." they are all sent to the view system."
[binding & forms] [^Atom view-system binding & forms]
(let [tvar (first binding) (let [tvar (first binding)
db (second binding) db (second binding)
args (drop 2 binding)] args (drop 2 binding)]
@ -23,7 +25,7 @@
result# (j/with-db-transaction [t# ~db ~@args] result# (j/with-db-transaction [t# ~db ~@args]
(let [~tvar (assoc ~db :views-honeysql/hints hints#)] (let [~tvar (assoc ~db :views-honeysql/hints hints#)]
~@forms))] ~@forms))]
(put-hints! @hints#) (put-hints! view-system @hints#)
result#)))) result#))))
(defn- execute-honeysql! (defn- execute-honeysql!
@ -46,12 +48,12 @@
- db: a clojure.java.jdbc database connection - db: a clojure.java.jdbc database connection
- namespace (optional): a namespace that will be included in the hints sent out - namespace (optional): a namespace that will be included in the hints sent out
- action-map: the HoneySQL map for the insert/update/delete SQL query" - action-map: the HoneySQL map for the insert/update/delete SQL query"
([db namespace action-map] ([^Atom view-system 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 (:views-honeysql/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! view-system [hsql-hint]))
results)) results))
([db action-map] ([^Atom view-system db action-map]
(vexec! db nil action-map))) (vexec! view-system db nil action-map)))