Merge pull request #14 from shopsmart/pre-launch-tweaks

Pre launch tweaks
shopsmart · Oct 26, 2016 · ea8c422 · ea8c422
2 parents 6599d0f + 6203bda
commit ea8c422
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/clj_infrastructure/db.clj b/src/clj_infrastructure/db.clj
@@ -76,9 +76,9 @@
   "Returns true if this exception's message matches any of the substrings in fatal-exceptions and
   false otherwise."
   [e :- Throwable]
-  (let [msg                      (d/replace-nil (.getMessage e) "")
+  (let [ex-str                   (d/replace-nil (str e) "")
         fatal-exception-messages (dbconfig {} :fatal-exceptions)]
-    (reduce (fn [fatal msg-substring] (if (str/includes? msg msg-substring) (reduced true))) false fatal-exception-messages)))
+    (reduce (fn [fatal ex-str-substring] (if (str/includes? ex-str ex-str-substring) (reduced true))) false fatal-exception-messages)))
 
 
 (s/defn any-fatal-exceptions? :- s/Bool

diff --git a/test/clj_infrastructure/db_test.clj b/test/clj_infrastructure/db_test.clj
@@ -42,7 +42,7 @@
 
 
 (def current-db :h2)
-
+;(def current-db :redshift)
 
 (defn test-table [basename] (str basename (System/getProperty "user.name"))) ; so it's impossible for two users' tests to conflict
 
@@ -483,7 +483,6 @@
        (testing "The failed transaction's inserts rolled back."
          (is (not (seq (query "select * from ${test-table} where id >= 10" CONNECTION conn))))))))
 
-
   (testing "Validate (.setAutoCommit conn false) doesn't respect autocommit=false in db-do-commands."
       (jdbc/with-db-connection [conn (config DB-SPEC)]