Просмотр исходного кода

fix: remove :block/path-refs entity

Tienson Qin 1 месяц назад
Родитель
Сommit
12f65c315c

+ 8 - 7
src/main/frontend/worker/db/migrate.cljs

@@ -396,14 +396,15 @@
             :block/name (common-util/page-name-sanity-lc (:block/title page))})))
      pages)))
 
-(defn remove-block-path-refs-datoms
+(defn remove-block-path-refs
   [db]
   (when (d/entity db :block/path-refs)
-    (->> (d/datoms db :avet :block/path-refs)
-         (map :e)
-         (distinct)
-         (map (fn [id]
-                [:db/retract id :block/path-refs])))))
+    (let [remove-datoms (->> (d/datoms db :avet :block/path-refs)
+                             (map :e)
+                             (distinct)
+                             (mapv (fn [id]
+                                     [:db/retract id :block/path-refs])))]
+      (conj remove-datoms [:db/retractEntity :block/path-refs]))))
 
 (defn- remove-position-property-from-url-properties
   [db]
@@ -428,7 +429,7 @@
    ["65.8" {:fix add-missing-page-name}]
    ["65.9" {:properties [:logseq.property.embedding/hnsw-label-updated-at]}]
    ["65.10" {:properties [:block/journal-day :logseq.property.view/sort-groups-by-property :logseq.property.view/sort-groups-desc?]}]
-   ["65.11" {:fix remove-block-path-refs-datoms}]
+   ["65.11" {:fix remove-block-path-refs}]
    ["65.12" {:fix remove-position-property-from-url-properties}]])
 
 (let [[major minor] (last (sort (map (comp (juxt :major :minor) db-schema/parse-schema-version first)

+ 4 - 5
src/main/frontend/worker/db/validate.cljs

@@ -23,11 +23,10 @@
                            (and (:block/tx-id entity) (nil? (:block/title entity)))
                            [[:db/retractEntity (:db/id entity)]]
                            (= :block/path-refs (:db/ident entity))
-                           (concat [[:db/retractEntity (:db/id entity)]]
-                                   (try
-                                     (db-migrate/remove-block-path-refs-datoms db)
-                                     (catch :default _e
-                                       nil)))
+                           (try
+                             (db-migrate/remove-block-path-refs db)
+                             (catch :default _e
+                               nil))
                            (and (= dispatch-key :block) (nil? (:block/title entity)))
                            [[:db/retractEntity (:db/id entity)]]