From 88272cbd068412264423f7ba9bac3595822240fe Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Thu, 22 May 2025 03:19:18 +0800 Subject: [PATCH 1/2] fix: don't transact unknown page It's dangerous because the db might be broken so that some titles are missing, it might be also because the page is not fully loaded to UI. --- src/main/frontend/components/block.cljs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index ca321478cb..9051f93f75 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -767,9 +767,6 @@ (do (prn :debug :unknown-title-error :title s :data (db/pull (:db/id page-entity))) - (db/transact! [{:db/id (:db/id page-entity) - :block/title "FIX unknown page" - :block/name "fix unknown page"}]) "Unknown title") (re-find db-content/id-ref-pattern s) (db-content/content-id-ref->page s (:block/refs page-entity)) From f4d3dca19c33f2facd7d8608e590055234ff8bab Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Wed, 21 May 2025 16:05:28 -0400 Subject: [PATCH 2/2] fix: db-idents like :logseq.kv/graph-initial-schema-version being ovewritten by migration and validation. Looks like this was introduced in 985365a27486738451a03a1246db987b9a9afdbf Fixes https://test.logseq.com/#/page/682e2616-cd2d-48ba-8f90-a1ace81dc87e --- src/main/frontend/worker/db/migrate.cljs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs index 2a6fd9519c..dde5f581dd 100644 --- a/src/main/frontend/worker/db/migrate.cljs +++ b/src/main/frontend/worker/db/migrate.cljs @@ -987,14 +987,15 @@ (when (neg? compare-result) (js/console.warn (str "Current db schema-version is " db-schema/version ", max available schema-version is " max-schema-version)))) -(defn- ensure-built-in-data-exists! +(defn ensure-built-in-data-exists! [conn] (let [*uuids (atom {}) data (->> (sqlite-create-graph/build-db-initial-data "") (keep (fn [data] (if (map? data) (cond - (= (:db/ident data) :logseq.kv/schema-version) + ;; Already created db-idents like :logseq.kv/graph-initial-schema-version should not be overwritten + (= "logseq.kv" (some-> (:db/ident data) namespace)) nil (= (:block/title data) "Contents")