Version 1.2.6

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.6
+
+- Tempid resolution fails in some cases #403 
+
 # 1.2.5
 
 - Special case Inf/-Inf and NaN in serializer since JSON can’t hold them #402

README.md

@@ -18,7 +18,7 @@ The intention with DataScript is to be a basic building block in client-side app
 ## Latest version [![Build Status](https://travis-ci.org/tonsky/datascript.svg?branch=master)](https://travis-ci.org/tonsky/datascript)
 
 ```clj
-[datascript "1.2.5"]
+[datascript "1.2.6"]
 ```
 
 ## Support us
@@ -166,7 +166,7 @@ For more examples, see [our acceptance test suite](test/datascript/test/).
 DataScript can be used from any JS engine without additional dependencies:
 
 ```html
-<script src="https://github.com/tonsky/datascript/releases/download/1.2.5/datascript-1.2.5.min.js"></script>
+<script src="https://github.com/tonsky/datascript/releases/download/1.2.6/datascript-1.2.6.min.js"></script>
 ```
 
 or as a CommonJS module ([npm page](https://www.npmjs.org/package/datascript)):

project.clj

@@ -1,4 +1,4 @@
-(def version "1.2.5")
+(def version "1.2.6")
 
 (defproject datascript (str version (System/getenv "DATASCRIPT_CLASSIFIER"))
   :description "An implementation of Datomic in-memory database and Datalog query engine in ClojureScript"

release-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datascript",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Immutable in-memory triplestore with Datalog queries",
   "homepage": "https://github.com/tonsky/datascript",
   "author": "Nikita Prokopov (https://github.com/tonsky)",

release-js/wrapper.prefix

@@ -1,5 +1,5 @@
 /**
- * Datascript v1.2.5
+ * Datascript v1.2.6
  *
  * Copyright 2014-2021 Nikita Prokopov
  *

src/datascript/db.cljc

@@ -1376,8 +1376,11 @@
                      (contains? tempids old-eid)
                      (not= upserted-eid (get tempids old-eid)))
               (retry-with-tempid initial-report report initial-es old-eid upserted-eid)
-              (recur (allocate-eid report old-eid upserted-eid)
-                     (concat (explode db (assoc entity' :db/id upserted-eid)) entities)))
+              (recur
+                (-> report
+                  (allocate-eid old-eid upserted-eid)
+                  (update ::tx-redundant conjv (datom upserted-eid nil nil tx0)))
+                (concat (explode db (assoc entity' :db/id upserted-eid)) entities)))
 
             ;; resolved | allocated-tempid | tempid | nil => explode
             (or (number? old-eid)

test/datascript/test/upsert.cljc

@@ -190,6 +190,27 @@
     (is (= {:db/id 2, :name "Bob", :likes "Pizza", :age 42}
            (tdc/entity-map db 2)))))
 
+;; https://github.com/tonsky/datascript/issues/403
+(deftest test-upsert-string-tempid-ref
+  (let [db   (-> (d/empty-db {:name {:db/unique :db.unique/identity}
+                              :ref {:db/valueType :db.type/ref}})
+                (d/db-with [{:name "Alice"}]))
+        expected #{[1 :name "Alice"]
+                   [2 :age 36]
+                   [2 :ref 1]}]
+    (is (= expected (tdc/all-datoms
+                      (d/db-with db [{:db/id "user", :name "Alice"}
+                                     {:age 36, :ref "user"}]))))
+    (is (= expected (tdc/all-datoms
+                      (d/db-with db [[:db/add "user" :name "Alice"]
+                                     {:age 36, :ref "user"}]))))
+    (is (= expected (tdc/all-datoms
+                      (d/db-with db [{:db/id -1, :name "Alice"}
+                                     {:age 36, :ref -1}]))))
+    (is (= expected (tdc/all-datoms
+                      (d/db-with db [[:db/add -1, :name "Alice"]
+                                     {:age 36, :ref -1}]))))))
+
 (deftest test-vector-upsert
   (let [db (-> (d/empty-db {:name {:db/unique :db.unique/identity}})
                (d/db-with [{:db/id -1, :name "Ivan"}]))]