Tienson Qin 2 лет назад
Родитель
Сommit
e60ea3ac10
2 измененных файлов с 5 добавлено и 4 удалено
  1. 0 1
      deps/db/src/logseq/db/sqlite/db.cljs
  2. 5 3
      src/main/frontend/db/restore.cljs

+ 0 - 1
deps/db/src/logseq/db/sqlite/db.cljs

@@ -112,7 +112,6 @@
           (upsert-addr-content! repo data)))
       (-restore [_ addr]
         (let [content (restore-data-from-addr repo addr)]
-          (assert (some? content) (str "Restore address data not exists, addr: " addr))
           (edn/read-string content))
         ;; disable cache for now
         ;; (when-let [content (if (cache/has? cache addr)

+ 5 - 3
src/main/frontend/db/restore.cljs

@@ -128,9 +128,11 @@
                                                                          (fn profiled-d-conn [& args]
                                                                            (util/profile :restore-graph-from-sqlite!-init-db (apply d/conn-from-datoms args)))}))
           [conn datoms-count] (if electron?
-                                (let [datoms (dt/read-transit-str (or data ""))]
-                                  [(d/conn-from-datoms datoms db-schema/schema-for-db-based-graph)
-                                   (count datoms)])
+                                (do
+                                  (assert (some? data) "No data found when reloading db")
+                                  (let [datoms (dt/read-transit-str data)]
+                                    [(d/conn-from-datoms datoms db-schema/schema-for-db-based-graph)
+                                     (count datoms)]))
                                 [conn datoms-count])
           db-name (db-conn/datascript-db repo)
           _ (swap! db-conn/conns assoc db-name conn)