fix: migration

hdansou · Nov 30, 2024 · 31ffe5a · 31ffe5a
1 parent af31d3d
commit 31ffe5a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/deps/db/src/logseq/db/frontend/content.cljs b/deps/db/src/logseq/db/frontend/content.cljs
@@ -6,10 +6,15 @@
             [logseq.common.util :as common-util]
             [logseq.db.frontend.entity-util :as entity-util]))
 
-#_(defonce page-ref-special-chars "~^")
-
-(defonce id-ref-pattern
-  #"\[\[([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\]\]")
+;; [[uuid]]
+(def id-ref-pattern
+  (re-pattern
+   (str
+    "\\[\\["
+    "("
+    common-util/uuid-pattern
+    ")"
+    "\\]\\]")))
 
 (defn content-id-ref->page
   "Convert id ref backs to page name using refs."

diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs
@@ -404,14 +404,14 @@
                   (re-find db-content/id-ref-pattern v))
              [:db/retractEntity e]
 
-             (string/includes? v (str ref-special-chars page-ref/left-brackets))
-             (let [title' (string/replace v (str ref-special-chars page-ref/left-brackets) page-ref/left-brackets)]
+             (string/includes? v (str page-ref/left-brackets ref-special-chars))
+             (let [title' (string/replace v (str page-ref/left-brackets ref-special-chars) page-ref/left-brackets)]
                (prn :debug {:old-title v :new-title title'})
                {:db/id e
                 :block/title title'})
 
              (re-find id-ref-pattern v)
-             (let [title' (string/replace v id-ref-pattern (page-ref/->page-ref "$1"))]
+             (let [title' (string/replace v id-ref-pattern "$1")]
                (prn :debug {:old-title v :new-title title'})
                {:db/id e
                 :block/title title'})))))