clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-25 21:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rebuild from datoms when db migration failed

Browse Source
This commit is contained in:
Tienson Qin
2025-05-07 04:51:42 +08:00
parent a5a4d23958
commit 73a8708b1b
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/frontend/worker/db/migrate.cljs
View File

@@ -828,18 +828,21 @@
(fn [col]
(reduce
(fn [col property]
(mapv (fn [item]
(if (and (vector? item) (= property (first item)))
(let [[p o v] item
f (fn [id]
(let [new-ident (get new-idents (:db/ident (d/entity db [:block/uuid id])))]
(common-uuid/gen-uuid :db-ident-block-uuid new-ident)))
v' (if (set? v)
(set (map f v))
(f v))]
[p o v'])
item))
col))
(vec
(keep (fn [item]
(if (and (vector? item) (= property (first item)))
(let [[p o v] item
f (fn [id]
(when-let [new-ident (get new-idents (:db/ident (d/entity db [:block/uuid id])))]
(common-uuid/gen-uuid :db-ident-block-uuid new-ident)))
v' (if (set? v)
(when-let [v' (seq (keep f v))]
(set v'))
(f v))]
(when v'
[p o v']))
item))
col)))
col
[:logseq.task/status :logseq.task/priority])))]
[:db/add (:e d) :logseq.property.table/filters value]))))))]

2
src/main/frontend/worker/db_worker.cljs
View File

@@ -367,7 +367,7 @@
(catch :default e
(log/error "DB migrate failed, error: " e)
(if (and db-based? (= (:message e) "DB missing addresses"))
(if (and db-based? (= (.-message e) "DB missing addresses"))
(do
(rebuild-db-from-datoms! conn db import-type)
(db-migrate/migrate conn search-db))