Return nil from restore-conn if no database

tonsky · Aug 14, 2023 · 6c18d23 · 6c18d23
1 parent 7528577
commit 6c18d23
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/datascript/core.cljc b/src/datascript/core.cljc
@@ -498,13 +498,13 @@
 
 #?(:clj
    (defn restore-conn
-     "Lazy-load database from storage and make conn out of it"
+     "Lazy-load database from storage and make conn out of it.
+      Returns nil if there’s no database yet in storage"
      ([storage]
       (restore-conn storage {}))
      ([storage opts]
-      (let [[db tail] (storage/restore-impl storage opts)
-            db' (storage/db-with-tail db tail)]
-        (atom db'
+      (when-some [[db tail] (storage/restore-impl storage opts)]
+        (atom (storage/db-with-tail db tail)
           :meta {:listeners      (atom {})
                  :tx-tail        (atom tail)
                  :db-last-stored (atom db)})))))