Fixed tempid/upsert resolution when multiple tempids are added first (c…

…loses #472)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Stable sorting of sequences of various types #470
 - Correctly restore `:max-tx` from storage
+- Fixed tempid/upsert resolution when multiple tempids are added first #472
 
 # 1.6.5 - May 3, 2024
 

src/datascript/db.cljc

@@ -1562,15 +1562,17 @@
 (declare+ transact-tx-data [initial-report initial-es])
 
 (defn- retry-with-tempid [initial-report report es tempid upserted-eid]
-  (if (contains? (:tempids initial-report) tempid)
+  (if-some [eid (get (::upserted-tempids initial-report) tempid)]
     (raise "Conflicting upsert: " tempid " resolves"
-           " both to " upserted-eid " and " (get-in initial-report [:tempids tempid])
+      " both to " upserted-eid " and " eid
       {:error :transact/upsert})
     ;; try to re-run from the beginning
     ;; but remembering that `tempid` will resolve to `upserted-eid`
     (let [tempids' (-> (:tempids report)
                      (assoc tempid upserted-eid))
-          report'  (assoc initial-report :tempids tempids')]
+          report'  (-> initial-report
+                     (assoc :tempids tempids')
+                     (update ::upserted-tempids assoc tempid upserted-eid))] 
       (transact-tx-data report' es))))
 
 (def builtin-fn?
@@ -1634,6 +1636,7 @@
         (empty? es)
         (-> report
           (check-value-tempids)
+          (dissoc ::upserted-tempids)
           (update :tempids assoc :db/current-tx (current-tx report))
           (update :db-after update :max-tx inc)
           #_(update :db-after persistent!))

test/datascript/test/upsert.cljc

@@ -196,7 +196,6 @@
 
     ))
 
-
 (deftest test-redefining-ids
   (let [db (-> (d/empty-db {:name { :db/unique :db.unique/identity }})
              (d/db-with [{:db/id -1 :name "Ivan"}]))]
@@ -253,6 +252,26 @@
                       (d/db-with db [[:db/add -1, :name "Alice"]
                                      {:age 36, :ref -1}]))))))
 
+;; https://github.com/tonsky/datascript/issues/472
+(deftest test-two-tempids-two-retries
+  (let [schema   {:name {:db/unique :db.unique/identity}
+                  :ref {:db/valueType :db.type/ref}}
+        db       (d/db-with
+                   (d/empty-db schema)
+                   [{:name "Alice"}
+                    {:name "Bob"}])
+        expected #{[1 :name "Alice"]
+                   [2 :name "Bob"]
+                   [3 :ref 1]
+                   [4 :ref 2]}]
+    (is (= expected
+          (tdc/all-datoms
+            (d/db-with db
+              [{:db/id 3, :ref "A"}
+               {:db/id 4, :ref "B"}
+               {:db/id "A", :name "Alice"}
+               {:db/id "B", :name "Bob"}]))))))
+
 (deftest test-vector-upsert
   (let [db (-> (d/empty-db {:name {:db/unique :db.unique/identity}})
              (d/db-with [{:db/id -1, :name "Ivan"}]))]