Minor tweaks for datomic cloud

This commit is contained in:
2023-03-19 23:11:47 -07:00
parent 45ab9fe0af
commit 8104506988
2 changed files with 12 additions and 5 deletions

View File

@@ -8,7 +8,7 @@
:dependencies [[com.google.guava/guava "31.1-jre"] :dependencies [[com.google.guava/guava "31.1-jre"]
[org.clojure/clojure "1.10.1"] [org.clojure/clojure "1.10.1"]
[com.datomic/dev-local "1.0.243"]
[com.datomic/datomic-pro "0.9.5783" [com.datomic/datomic-pro "0.9.5783"
:exclusions [com.google.guava/guava :exclusions [com.google.guava/guava
org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpclient
@@ -18,7 +18,7 @@
org.slf4j/slf4j-log4j12]] org.slf4j/slf4j-log4j12]]
[com.unbounce/clojure-dogstatsd-client "0.7.0"] [com.unbounce/clojure-dogstatsd-client "0.7.0"]
[com.cognitect/hmac-authn "0.1.210"] [com.cognitect/hmac-authn "0.1.210"]
[com.datomic/client-cloud "1.0.119"] [com.datomic/client-cloud "1.0.123"]
[com.cognitect/http-client "1.0.115"] [com.cognitect/http-client "1.0.115"]
[lambdaisland/edn-lines "1.0.10"] [lambdaisland/edn-lines "1.0.10"]
[bidi "2.1.6"] [bidi "2.1.6"]
@@ -136,6 +136,7 @@
:dependencies [#_[binaryage/devteols "1.0.2"] :dependencies [#_[binaryage/devteols "1.0.2"]
[postgresql/postgresql "9.3-1102.jdbc41"] [postgresql/postgresql "9.3-1102.jdbc41"]
[org.clojure/java.jdbc "0.7.11"] [org.clojure/java.jdbc "0.7.11"]
[com.datomic/dev-local "1.0.243"]
[etaoin "0.4.1"] [etaoin "0.4.1"]
[com.bhauman/figwheel-main "0.2.18" :exclusions [org.clojure/clojurescript [com.bhauman/figwheel-main "0.2.18" :exclusions [org.clojure/clojurescript
ring ring

View File

@@ -12,6 +12,7 @@
[clojure.set :as set] [clojure.set :as set]
[clojure.tools.logging :as log] [clojure.tools.logging :as log]
[datomic.client.api :as dc] [datomic.client.api :as dc]
[com.brunobonacci.mulog :as mu]
)) ))
(defn <-datomic [result] (defn <-datomic [result]
@@ -194,9 +195,14 @@
true true
(merge-query {:query {:find ['?date '?e] (merge-query {:query {:find ['?date '?e]
:where ['[?e :sales-order/date ?date]]}}))] :where ['[?e :sales-order/date ?date]]}}))]
(log/info "Sales query" query)
(cond->> query (println query)
(mu/log ::query-stats
:stats (:query-stats (dc/q (assoc query :query-stats true)))
:q (str query))
(cond->> (assoc query :query-stats true)
true (dc/q) true (dc/q)
true (apply-sort-3 (assoc args :default-asc? false)) true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args)))) true (apply-pagination args))))