greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Pre: Don't insert nil tx where it should not be.

Browse source
This commit is contained in:
Nick Alexander 2016-09-09 15:21:48 -07:00
parent c46f0eb8ae
commit 20531c1789
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/datomish/transact.cljc
View file

@ -61,7 +61,7 @@
db-after ;; The DB after the transaction. db-after ;; The DB after the transaction.
tx ;; The tx ID represented by the transaction in this report; refer :db/tx. tx ;; The tx ID represented by the transaction in this report; refer :db/tx.
txInstant ;; The timestamp instant when the the transaction was processed/committed in this report; refer :db/txInstant. txInstant ;; The timestamp instant when the the transaction was processed/committed in this report; refer :db/txInstant.
entities ;; The set of entities (like [:db/add e a v tx]) processed. entities ;; The set of entities (like [:db/add e a v]) processed.
tx-data ;; The set of datoms applied to the database, like (Datom. e a v tx added). tx-data ;; The set of datoms applied to the database, like (Datom. e a v tx added).
tempids ;; The map from id-literal -> numeric entid. tempids ;; The map from id-literal -> numeric entid.
part-map ;; Map {:db.part/user {:start 0x10000 :idx 0x10000}, ...}. part-map ;; Map {:db.part/user {:start 0x10000 :idx 0x10000}, ...}.
@ -118,7 +118,7 @@
true true
entity)) entity))
(defn maybe-ident->entid [db [op e a v tx :as orig]] (defn maybe-ident->entid [db [op e a v :as orig]]
;; We have to handle all ops, including those when a or v are not defined. ;; We have to handle all ops, including those when a or v are not defined.
(let [e (db/entid db e) (let [e (db/entid db e)
a (db/entid db a) a (db/entid db a)
@ -128,7 +128,7 @@
(when (and a (not (integer? a))) (when (and a (not (integer? a)))
(raise "Unknown attribute " a (raise "Unknown attribute " a
{:form orig :attribute a})) {:form orig :attribute a}))
[op e a v tx])) [op e a v]))
(defrecord Transaction [db tempids entities]) (defrecord Transaction [db tempids entities])