Fixed regression when unique ref tempid was not resolved during trans…

…action (closes #295)

CHANGELOG.md

@@ -1,7 +1,8 @@
 # WIP
 
-- Fixed regression when transient indexes were mutated and iterated during single tx (#294)
-- Bumped persistent-sorted-set to 0.1.2 (throw if transient set is mutated and iterated at the same time)
+- Fixed regression when transient indexes were mutated and iterated during single tx (#294).
+- Bumped persistent-sorted-set to 0.1.2 (throw if transient set is mutated and iterated at the same time).
+- Fixed regression when unique ref tempid was not resolved during transaction (#295).
 
 # 0.18.1
 

src/datascript/db.cljc

@@ -1235,6 +1235,11 @@
             (and (ref? db a) (tx-id? v))
             (recur (allocate-eid report v (current-tx report)) (cons [op e a (current-tx report)] entities))
 
+            (and (ref? db a) (tempid? v))
+            (if-some [vid (get tempids v)]
+              (recur report (cons [op e a vid] entities))
+              (recur (allocate-eid report v (next-eid db)) es))
+
             (tempid? e)
             (let [upserted-eid  (when (is-attr? db a :db.unique/identity)
                                   (:e (first (-datoms db :avet [a v]))))
@@ -1244,11 +1249,6 @@
                 (let [eid (or upserted-eid allocated-eid (next-eid db))]
                   (recur (allocate-eid report e eid) (cons [op eid a v] entities)))))
 
-            (and (ref? db a) (tempid? v))
-            (if-some [vid (get tempids v)]
-              (recur report (cons [op e a vid] entities))
-              (recur (allocate-eid report v (next-eid db)) es))
-
             (= op :db/add)
             (recur (transact-add report entity) entities)
 

test/datascript/test/transact.cljc

@@ -250,6 +250,17 @@
                   :where [?e :name ?n ?t]
                          [?e :age ?a]] @conn)))))
 
+(deftest test-tempid-ref-295
+  (let [db (-> (d/empty-db {:ref {:db/unique :db.unique/identity
+                                  :db/valueType :db.type/ref}})
+             (d/db-with [[:db/add -1 :name "Ivan"]
+                         [:db/add -2 :name "Petr"]
+                         [:db/add -1 :ref -2]]))]
+    (is (= #{[1 :name "Ivan"]
+             [1 :ref 2]
+             [2 :name "Petr"]}
+          (tdc/all-datoms db)))))
+
 (deftest test-resolve-eid-refs
   (let [conn (d/create-conn {:friend {:db/valueType :db.type/ref
                                       :db/cardinality :db.cardinality/many}})
@@ -300,7 +311,6 @@
           (is (= (into {} (d/entity @conn tx-id))
                  {:prop4 "prop4"})))))))
 
-
 (deftest test-transient-294
   "db.fn/retractEntity retracts attributes of adjacent entities https://github.com/tonsky/datascript/issues/294"
   (let [db (reduce #(d/db-with %1 [{:db/id %2 :a1 1 :a2 2 :a3 3}])