From 8d60712d956273d43c76fb9b90c40f12e55d2a8c Mon Sep 17 00:00:00 2001 From: Joe Lane Date: Mon, 12 Aug 2019 13:49:59 -0500 Subject: [PATCH] fix cloud connection bug after transacting with subsequent queries in the chain --- src/com/cognitect/vase/actions.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/cognitect/vase/actions.clj b/src/com/cognitect/vase/actions.clj index ec54aa2..103aa22 100644 --- a/src/com/cognitect/vase/actions.clj +++ b/src/com/cognitect/vase/actions.clj @@ -459,7 +459,7 @@ `headers` is an expression that evaluates to a map of header name (string) to header value (string). May be nil." - [code-gen properties db-op headers to] + [code-gen properties db-op headers to cloud?] (assert (or (nil? headers) (map? headers)) (str "Headers should be a map. I got " headers)) (let [to (or to ::transact-data)] `(fn [{~'request :request :as ~'context}] @@ -481,7 +481,7 @@ (assoc ~'context :response resp#) (assoc-in ~(assoc-or-assoc-in 'context to 'response-body) - [:request :db] (d/db conn#))))))) + [:request :db] (if ~cloud? (client/db conn#) (d/db conn#)))))))) (defrecord TransactAction [name properties db-op headers to doc] i/IntoInterceptor @@ -489,7 +489,7 @@ (dynamic-interceptor name {:enter - (transact-action-exprs (peer-code-gen) properties db-op headers to) + (transact-action-exprs (peer-code-gen) properties db-op headers to false) :action-literal :vase.datomic/transact}))) @@ -503,7 +503,7 @@ (dynamic-interceptor name {:enter - (transact-action-exprs (cloud-code-gen) properties db-op headers to) + (transact-action-exprs (cloud-code-gen) properties db-op headers to true) :action-literal :vase.datomic.cloud/transact})))