From 8104506988f6c5bb58d07c553305fee96b96c935 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 19 Mar 2023 23:11:47 -0700 Subject: [PATCH] Minor tweaks for datomic cloud --- project.clj | 5 +++-- src/clj/auto_ap/datomic/sales_orders.clj | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index f4b74de3..aa6aa34e 100644 --- a/project.clj +++ b/project.clj @@ -8,7 +8,7 @@ :dependencies [[com.google.guava/guava "31.1-jre"] [org.clojure/clojure "1.10.1"] - [com.datomic/dev-local "1.0.243"] + [com.datomic/datomic-pro "0.9.5783" :exclusions [com.google.guava/guava org.apache.httpcomponents/httpclient @@ -18,7 +18,7 @@ org.slf4j/slf4j-log4j12]] [com.unbounce/clojure-dogstatsd-client "0.7.0"] [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"] [lambdaisland/edn-lines "1.0.10"] [bidi "2.1.6"] @@ -136,6 +136,7 @@ :dependencies [#_[binaryage/devteols "1.0.2"] [postgresql/postgresql "9.3-1102.jdbc41"] [org.clojure/java.jdbc "0.7.11"] + [com.datomic/dev-local "1.0.243"] [etaoin "0.4.1"] [com.bhauman/figwheel-main "0.2.18" :exclusions [org.clojure/clojurescript ring diff --git a/src/clj/auto_ap/datomic/sales_orders.clj b/src/clj/auto_ap/datomic/sales_orders.clj index adc3125c..2fc64fa0 100644 --- a/src/clj/auto_ap/datomic/sales_orders.clj +++ b/src/clj/auto_ap/datomic/sales_orders.clj @@ -12,6 +12,7 @@ [clojure.set :as set] [clojure.tools.logging :as log] [datomic.client.api :as dc] + [com.brunobonacci.mulog :as mu] )) (defn <-datomic [result] @@ -194,9 +195,14 @@ true (merge-query {:query {:find ['?date '?e] :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 (apply-sort-3 (assoc args :default-asc? false)) true (apply-pagination args))))