From 2b705019a722bc8d886cc5c094536e571c769733 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 14 Jul 2016 11:09:42 -0700
Subject: [PATCH] Pre: Take more general `raise` from DataScript.

---
 src/datomish/query.cljc                     |  4 ++--
 src/datomish/sqlite_schema.cljc             |  4 ++--
 src/datomish/util.cljc                      | 18 ++++++++++++++----
 test/datomish/sqlite_user_version_test.cljc |  2 +-
 test/datomish/test/util.cljc                | 16 ++++++++--------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/datomish/query.cljc b/src/datomish/query.cljc
index e66db737..3924f09a 100644
--- a/src/datomish/query.cljc
+++ b/src/datomish/query.cljc
@@ -4,7 +4,7 @@
 
 (ns datomish.query
   (:require
-   [datomish.util :as util :refer [raise var->sql-var]]
+   [datomish.util :as util #?(:cljs :refer-macros :clj :refer) [raise cond-let]]
    [datomish.transforms :as transforms]
    [datascript.parser :as dp
     #?@(:cljs [:refer [Pattern DefaultSrc Variable Constant Placeholder]])]
@@ -157,7 +157,7 @@
       (raise "Unable to :find non-variables."))
     (map (fn [elem]
            (let [var (:symbol elem)]
-             [(lookup-variable context var) (var->sql-var var)]))
+             [(lookup-variable context var) (util/var->sql-var var)]))
          elements)))
 
 (defn row-pair-transducer [context projection]
diff --git a/src/datomish/sqlite_schema.cljc b/src/datomish/sqlite_schema.cljc
index 03f0686a..2b1c38f7 100644
--- a/src/datomish/sqlite_schema.cljc
+++ b/src/datomish/sqlite_schema.cljc
@@ -8,7 +8,7 @@
       [datomish.pair-chan :refer [go-pair <?]]
       [cljs.core.async.macros :refer [go]]))
   (:require
-   [datomish.util :as util :refer [raise]]
+   [datomish.util :as util #?(:cljs :refer-macros :clj :refer) [raise cond-let]]
    [datomish.sqlite :as s]
    #?@(:clj [[datomish.pair-chan :refer [go-pair <?]]
              [clojure.core.async :refer [go <! >!]]])
@@ -42,7 +42,7 @@
   {:pre [(> from-version 0)]} ;; Or we'd create-current-version instead.
   {:pre [(< from-version current-version)]} ;; Or we wouldn't need to update-from-version.
   (go-pair
-    (raise "No migrations yet defioned!")
+    (raise "No migrations yet defined!")
     (<? (s/set-user-version db current-version))
     (<? (s/get-user-version db))))
 
diff --git a/src/datomish/util.cljc b/src/datomish/util.cljc
index 3dd51168..71f590e4 100644
--- a/src/datomish/util.cljc
+++ b/src/datomish/util.cljc
@@ -3,12 +3,22 @@
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 (ns datomish.util
+  #?(:cljs (:require-macros datomish.util))
   (:require
-     [clojure.string :as str]))
+   [clojure.string :as str]))
 
-(defn raise [s]
-  #?(:clj (throw (Exception. s)))
-  #?(:cljs (throw (js/Error s))))
+#?(:clj
+   (defmacro raise [& fragments]
+     (let [msgs (butlast fragments)
+           data (last fragments)]
+       `(throw (ex-info (str ~@(map (fn [m#] (if (string? m#) m# (list 'pr-str m#))) msgs)) ~data)))))
+
+#?(:clj
+   (defmacro cond-let [& clauses]
+     (when-let [[test expr & rest] clauses]
+       `(~(if (vector? test) 'if-let 'if) ~test
+         ~expr
+         (cond-let ~@rest)))))
 
 (defn var->sql-var
   "Turns '?xyz into :xyz."
diff --git a/test/datomish/sqlite_user_version_test.cljc b/test/datomish/sqlite_user_version_test.cljc
index 52e45351..d47efc37 100644
--- a/test/datomish/sqlite_user_version_test.cljc
+++ b/test/datomish/sqlite_user_version_test.cljc
@@ -9,7 +9,7 @@
       [datomish.node-tempfile-macros :refer [with-tempfile]]
       [cljs.core.async.macros :as a :refer [go]]))
   (:require
-   [datomish.util :as util :refer [raise]]
+   [datomish.util :as util #?(:cljs :refer-macros :clj :refer) [raise cond-let]]
    [datomish.sqlite :as s]
    #?@(:clj [[datomish.pair-chan :refer [go-pair <?]]
              [tempfile.core :refer [tempfile with-tempfile]]
diff --git a/test/datomish/test/util.cljc b/test/datomish/test/util.cljc
index 291f6761..e170c297 100644
--- a/test/datomish/test/util.cljc
+++ b/test/datomish/test/util.cljc
@@ -10,11 +10,11 @@
   (is (= :XX (util/var->sql-var '?XX))))
 
 #?(:cljs
-     (deftest test-raise
-       (let [caught
-             (try
-               (do
-                 (util/raise "succeed")
-                 "fail")
-               (catch :default e e))]
-         (is (= "succeed" (aget caught "message"))))))
+   (deftest test-raise
+     (let [caught
+           (try
+             (do
+               (util/raise "succeed")
+               "fail")
+             (catch :default e e))]
+       (is (= "succeed" (aget caught "data"))))))