From f408cfd314c654c002fddbfa5b74d4f5530c32c8 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 4 Aug 2016 16:20:48 -0700
Subject: [PATCH] Follow-up: lift helpers to IDB.

---
 src/datomish/db.cljc | 52 ++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/datomish/db.cljc b/src/datomish/db.cljc
index 25241e94..6d4dc3c4 100644
--- a/src/datomish/db.cljc
+++ b/src/datomish/db.cljc
@@ -79,6 +79,14 @@
     [db datoms]
     "Apply datoms to the store.")
 
+  (<apply-db-ident-assertions
+    [db added-idents]
+    "Apply added idents to the store.")
+
+  (<apply-db-install-assertions
+    [db fragment]
+    "Apply added schema fragment to the store.")
+
   (<advance-tx
     [db]
     "TODO: document this interface."))
@@ -197,7 +205,27 @@
 
         ;; TODO: handle exclusion across transactions here.
         (update db :current-tx inc))))
-  ;;  )
+
+  (<apply-db-ident-assertions [db added-idents]
+    (go-pair
+      (let [->SQLite (get-in ds/value-type-map [:db.type/keyword :->SQLite]) ;; TODO: make this a protocol.
+            exec     (partial s/execute! (:sqlite-connection db))]
+        ;; TODO: batch insert.
+        (doseq [[ident entid] added-idents]
+          (<? (exec
+                ["INSERT INTO idents VALUES (?, ?)" (->SQLite ident) entid]))))
+      db))
+
+  (<apply-db-install-assertions [db fragment]
+    (go-pair
+      (let [->SQLite (get-in ds/value-type-map [:db.type/keyword :->SQLite]) ;; TODO: make this a protocol.
+            exec     (partial s/execute! (:sqlite-connection db))]
+        ;; TODO: batch insert.
+        (doseq [[ident attr-map] fragment]
+          (doseq [[attr value] attr-map]
+            (<? (exec
+                  ["INSERT INTO schema VALUES (?, ?, ?)" (->SQLite ident) (->SQLite attr) (->SQLite value)])))))
+      db))
 
   (close-db [db] (s/close (.-sqlite-connection db)))
 
@@ -984,28 +1012,6 @@
         schema-fragment (datomish.schema-changes/datoms->schema-fragment datoms)]
     (assoc-in report [:added-attributes] schema-fragment)))
 
-;; TODO: lift to IDB.
-(defn <apply-db-ident-assertions [db added-idents]
-  (go-pair
-    (let [->SQLite (get-in ds/value-type-map [:db.type/keyword :->SQLite]) ;; TODO: make this a protocol.
-          exec     (partial s/execute! (:sqlite-connection db))]
-      ;; TODO: batch insert.
-      (doseq [[ident entid] added-idents]
-        (<? (exec
-              ["INSERT INTO idents VALUES (?, ?)" (->SQLite ident) entid]))))
-    db))
-
-(defn <apply-db-install-assertions [db fragment]
-  (go-pair
-    (let [->SQLite (get-in ds/value-type-map [:db.type/keyword :->SQLite]) ;; TODO: make this a protocol.
-          exec     (partial s/execute! (:sqlite-connection db))]
-      ;; TODO: batch insert.
-      (doseq [[ident attr-map] fragment]
-        (doseq [[attr value] attr-map]
-          (<? (exec
-                ["INSERT INTO schema VALUES (?, ?, ?)" (->SQLite ident) (->SQLite attr) (->SQLite value)])))))
-    db))
-
 (defn- <with-internal [db tx-data merge-ident merge-attr]
   (go-pair
     (let [report (->>