From bf080ced3c51713cf116bf5974f8d6c9af192a2a Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 13 Jul 2016 16:17:07 -0700
Subject: [PATCH] Part 2: Add ISQLiteConnectionFactory and CLJC test that uses
 it.

---
 src/datomish/jdbc_sqlite.clj                |  9 ++++++
 src/datomish/promise_sqlite.cljs            |  9 ++++++
 src/datomish/sqlite.cljc                    |  5 +++
 test/datomish/sqlite_user_version_test.cljc | 35 +++++++++++++++++++++
 test/datomish/test.cljs                     |  2 ++
 5 files changed, 60 insertions(+)
 create mode 100644 test/datomish/sqlite_user_version_test.cljc

diff --git a/src/datomish/jdbc_sqlite.clj b/src/datomish/jdbc_sqlite.clj
index 421707d5..a3f5a5b9 100644
--- a/src/datomish/jdbc_sqlite.clj
+++ b/src/datomish/jdbc_sqlite.clj
@@ -38,3 +38,12 @@
         (j/get-connection spec)
         (assoc spec :connection)
         (->JDBCSQLiteConnection)))))
+
+(extend-protocol s/ISQLiteConnectionFactory
+  String
+  (<sqlite-connection [path]
+    (open path))
+
+  java.io.File
+  (<sqlite-connection [path]
+    (open path)))
diff --git a/src/datomish/promise_sqlite.cljs b/src/datomish/promise_sqlite.cljs
index 539fd5da..09adf895 100644
--- a/src/datomish/promise_sqlite.cljs
+++ b/src/datomish/promise_sqlite.cljs
@@ -35,3 +35,12 @@
     (->
       (.open sqlite.DB path (clj->js {:mode mode}))
       (.then ->SQLite3Connection))))
+
+(extend-protocol s/ISQLiteConnectionFactory
+  string
+  (<sqlite-connection [path]
+    (open path))
+
+  object ;; TODO: narrow this to the result of node-tempfile/tempfile.
+  (<sqlite-connection [tempfile]
+    (open (.-name tempfile))))
diff --git a/src/datomish/sqlite.cljc b/src/datomish/sqlite.cljc
index 12ac2b46..c7f966f6 100644
--- a/src/datomish/sqlite.cljc
+++ b/src/datomish/sqlite.cljc
@@ -33,6 +33,11 @@
     [db]
     "Close this SQLite connection. Returns a pair channel of [nil error]."))
 
+(defprotocol ISQLiteConnectionFactory
+  (<sqlite-connection
+    [path]
+    "Open an ISQLiteConnection to `path`.  Returns a pair channel of `[sqlite-connection error]`"))
+
 (defn execute!
   [db [sql & bindings]]
   (-execute! db sql bindings))
diff --git a/test/datomish/sqlite_user_version_test.cljc b/test/datomish/sqlite_user_version_test.cljc
new file mode 100644
index 00000000..52e45351
--- /dev/null
+++ b/test/datomish/sqlite_user_version_test.cljc
@@ -0,0 +1,35 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+(ns datomish.sqlite-user-version-test
+  #?(:cljs
+     (:require-macros
+      [datomish.pair-chan :refer [go-pair <?]]
+      [datomish.node-tempfile-macros :refer [with-tempfile]]
+      [cljs.core.async.macros :as a :refer [go]]))
+  (:require
+   [datomish.util :as util :refer [raise]]
+   [datomish.sqlite :as s]
+   #?@(:clj [[datomish.pair-chan :refer [go-pair <?]]
+             [tempfile.core :refer [tempfile with-tempfile]]
+             [datomish.test-macros :refer [deftest-async]]
+             [clojure.test :as t :refer [is are deftest testing]]
+             [clojure.core.async :refer [go <! >!]]])
+   #?@(:cljs [[datomish.pair-chan]
+              [datomish.test-macros :refer-macros [deftest-async]]
+              [datomish.node-tempfile :refer [tempfile]]
+              [cljs.test :as t :refer-macros [is are deftest testing async]]
+              [cljs.core.async :as a :refer [<! >!]]])))
+
+(deftest-async test-all-rows
+  (with-tempfile [t (tempfile)]
+    (let [db (<? (s/<sqlite-connection t))]
+      (try
+        (<? (s/execute! db ["CREATE TABLE test (a INTEGER)"]))
+        (<? (s/execute! db ["INSERT INTO test VALUES (?)" 1]))
+        (<? (s/execute! db ["INSERT INTO test VALUES (?)" 2]))
+        (let [rows (<? (s/all-rows db ["SELECT * FROM test ORDER BY a ASC"]))]
+          (is (= rows [{:a 1} {:a 2}])))
+        (finally
+          (<? (s/close db)))))))
diff --git a/test/datomish/test.cljs b/test/datomish/test.cljs
index 6254a663..97eab507 100644
--- a/test/datomish/test.cljs
+++ b/test/datomish/test.cljs
@@ -3,6 +3,7 @@
    [doo.runner :refer-macros [doo-tests doo-all-tests]]
    [cljs.test :as t :refer-macros [is are deftest testing]]
    datomish.promise-sqlite-test
+   datomish.sqlite-user-version-test
    datomish.test.util
    datomish.test.transforms
    datomish.test.query
@@ -10,6 +11,7 @@
 
 (doo-tests
   'datomish.promise-sqlite-test
+  'datomish.sqlite-user-version-test
   'datomish.test.util
   'datomish.test.transforms
   'datomish.test.query