Makes running datomic cloud work again
This commit is contained in:
@@ -98,10 +98,10 @@
|
||||
:account/default-allowance)
|
||||
|
||||
vendor-account (when vendor-id
|
||||
(-> (d/q '[:find ?da
|
||||
(-> (dc/q '[:find ?da
|
||||
:in $ ?v
|
||||
:where [?v :vendor/default-account ?da]]
|
||||
(d/db conn)
|
||||
(dc/db conn)
|
||||
vendor-id)
|
||||
ffirst))
|
||||
xform (comp
|
||||
@@ -117,37 +117,37 @@
|
||||
"This account is not typically used for this purpose.")})))]
|
||||
(if query
|
||||
(if num
|
||||
(->> (d/q '[:find ?n (pull ?i pattern)
|
||||
(->> (dc/q '[:find ?n (pull ?i pattern)
|
||||
:in $ ?numeric-code ?allowance pattern
|
||||
:where [?i :account/numeric-code ?numeric-code]
|
||||
[?i :account/name ?n]
|
||||
(or [?i :account/applicability :account-applicability/global]
|
||||
[?i :account/applicability :account-applicability/optional]
|
||||
[?i :account/applicability :account-applicability/customized])]
|
||||
(d/db conn)
|
||||
(dc/db conn)
|
||||
num
|
||||
allowance
|
||||
search-pattern)
|
||||
(sequence xform))
|
||||
(->> (d/q '[:find ?n (pull ?i pattern) ?s
|
||||
(->> (dc/q '[:find ?n (pull ?i pattern) ?s
|
||||
:in $ ?q ?allowance pattern
|
||||
:where [(fulltext $ :account/search-terms ?q) [[?i ?n _ ?s]]]
|
||||
[?i :account/numeric-code ?numeric-code]
|
||||
(or [?i :account/applicability :account-applicability/global]
|
||||
[?i :account/applicability :account-applicability/optional])]
|
||||
(d/db conn)
|
||||
(dc/db conn)
|
||||
query
|
||||
allowance
|
||||
search-pattern)
|
||||
(concat (when client
|
||||
(d/q '[:find ?n (pull ?a pattern) ?s
|
||||
(dc/q '[:find ?n (pull ?a pattern) ?s
|
||||
:in $ ?c ?q ?allowance pattern
|
||||
:where
|
||||
[?i :account-client-override/client ?c]
|
||||
[(fulltext $ :account-client-override/search-terms ?q) [[?i ?n _ ?s]]]
|
||||
[?a :account/client-overrides ?i]
|
||||
[?a :account/numeric-code ?numeric-code]]
|
||||
(d/db conn)
|
||||
(dc/db conn)
|
||||
client
|
||||
query
|
||||
allowance
|
||||
|
||||
Reference in New Issue
Block a user