From 2506b7b592ce6f618b186aedaa8f27483a975a6f Mon Sep 17 00:00:00 2001 From: BC Date: Fri, 10 Aug 2018 06:33:35 -0700 Subject: [PATCH 1/2] fixing issue in production. --- src/clj/auto_ap/db/invoices.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clj/auto_ap/db/invoices.clj b/src/clj/auto_ap/db/invoices.clj index 35fcf95c..53062c44 100644 --- a/src/clj/auto_ap/db/invoices.clj +++ b/src/clj/auto_ap/db/invoices.clj @@ -30,7 +30,7 @@ (map clj->db ) (map (apply juxt k))))]] :insert-into [[:invoices k] - {:select [:v.company-id :v.vendor-id :v.invoice-number :v.total (sql/raw "cast(v.date as timestamp)") :v.imported :v.status :v.outstanding-balance :v.default-location :v.default-expense-account] + {:select [:v.company-id :v.vendor-id :v.invoice-number :v.total (sql/raw "cast(v.date as timestamp)") :v.imported :v.status :v.outstanding-balance :v.default-location (sql/raw "cast(v.default_expense_account as INT)")] :from [:v] :left-join [[:invoices :exist] [:and From 3d20cb31a0a1faacda2dd22c36656e922ef2868a Mon Sep 17 00:00:00 2001 From: BC Date: Fri, 10 Aug 2018 06:36:38 -0700 Subject: [PATCH 2/2] Revert "adding datomic" This reverts commit 913a44fb48c15fcae0e6ae1b0f9deb501edf8cbb. --- docker-compose.dev.yml | 5 ----- docker-compose.yml | 8 -------- project.clj | 3 --- 3 files changed, 16 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 01797ef8..a8b1b304 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -3,8 +3,3 @@ services: database: ports: - "5432:5432" - datomic-transactor: - environment: - - DATOMIC_PORT=4334 - ports: - - 4334:4334 diff --git a/docker-compose.yml b/docker-compose.yml index 671f7391..85ebcecf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,13 +39,5 @@ services: - database environment: DATABASE_URL: "postgresql://ap:fifteen-invoices-imported!@database/autoap?ssl=false" - datomic-transactor: - image: 679918342773.dkr.ecr.us-east-1.amazonaws.com/datomic - environment: - - DATOMIC_HOST=datomic-transactor - - DATOMIC_PORT=4334 - - DATOMIC_SQL_HOST=database - ports: - - 4334:4334 diff --git a/project.clj b/project.clj index 8cd647f2..6607ec49 100644 --- a/project.clj +++ b/project.clj @@ -2,11 +2,8 @@ :description "FIXME: write description" :url "http://example.com/FIXME" :min-lein-version "2.0.0" - :repositories {"my.datomic.com" {:url "https://my.datomic.com/repo" - :creds :gpg}} :dependencies [[org.clojure/clojure "1.9.0"] [org.clojure/clojurescript "1.10.238"] - [postgresql/postgresql "9.3-1102.jdbc41"] [compojure "1.6.0"] [kibu/pushy "0.3.8"] [bidi "2.1.2"]