소스 검색

fix: db ident

Tienson Qin 1 년 전
부모
커밋
872bc00216

+ 1 - 1
deps/db/src/logseq/db/frontend/property.cljs

@@ -180,7 +180,7 @@
                           key)]
       (if (sqlite-util/db-based-graph? repo)
         (when-let [property (d/entity db [:block/name (common-util/page-name-sanity-lc property-name)])]
-          (get coll (:block/uuid property)))
+          (get coll (:db/ident property)))
         (get coll key)))))
 
 (defn get-block-property-value

+ 2 - 2
deps/db/src/logseq/db/frontend/property/util.cljs

@@ -13,7 +13,7 @@
    :block/format :markdown
    :block/uuid block-id
    :block/page page-id
-   :logseq.property/created-from-property [:block/uuid (:block/uuid property)]
+   :logseq.property/created-from-property (:db/ident property)
    :block/schema {:value value}
    :block/parent page-id})
 
@@ -50,7 +50,7 @@
 (defn build-property-hidden-page
   "Builds a hidden property page for closed values to be transacted"
   [property]
-  (let [page-name (str hidden-page-name-prefix (:block/uuid property))]
+  (let [page-name (str hidden-page-name-prefix (:db/ident property))]
     (-> (build-new-page page-name)
         (assoc :block/type #{"hidden"}
                :block/format :markdown))))

+ 7 - 2
deps/db/src/logseq/db/sqlite/create_graph.cljs

@@ -83,5 +83,10 @@
                                    :block/uuid (d/squuid)}
                                    (seq properties)
                                    (assoc :class/schema.properties properties)))))))
-                         db-class/built-in-classes)]
-    (vec (concat initial-data initial-files default-properties default-pages default-classes))))
+                         db-class/built-in-classes)
+        db-idents (keep (fn [x] (when-let [ident (:db/ident x)]
+                                  {:db/ident ident}))
+                        (concat default-properties default-classes))]
+    (vec (concat db-idents
+                 default-properties default-classes
+                 initial-data initial-files default-pages))))

+ 1 - 1
deps/outliner/src/logseq/outliner/core.cljs

@@ -310,7 +310,7 @@
                                              id))))))]
      (cond-> m
        matched-status-id
-       (update :block/properties assoc (:block/uuid property) matched-status-id)
+       (assoc (:db/ident property) matched-status-id)
 
        matched-status-id
        (update :block/content (fn [content]

+ 3 - 3
src/main/frontend/handler/db_based/property.cljs

@@ -487,7 +487,7 @@
                     :block/left (or (when page-entity (model/get-block-last-direct-child-id (db/get-db) (:db/id page-entity)))
                                     page-id)
                     :logseq.property/created-from-block [:block/uuid (:block/uuid block)]
-                    :logseq.property/created-from-property [:block/uuid (:block/uuid property)]}
+                    :logseq.property/created-from-property (:db/id property)}
                    sqlite-util/block-with-timestamps)
         child-1-id (db/new-block-id)
         child-1 (-> {:block/uuid child-1-id
@@ -539,7 +539,7 @@
                        :block/left (or (when page-entity (model/get-block-last-direct-child-id (db/get-db) (:db/id page-entity)))
                                        page-id)
                        :logseq.property/created-from-block [:block/uuid (:block/uuid block)]
-                       :logseq.property/created-from-property [:block/uuid (:block/uuid property)]
+                       :logseq.property/created-from-property (:db/id property)
                        :logseq.property/created-from-template [:block/uuid (:block/uuid template)]}
                       sqlite-util/block-with-timestamps)]
     {:page page-tx
@@ -547,7 +547,7 @@
 
 (defn- get-property-hidden-page
   [property]
-  (let [page-name (str db-property-util/hidden-page-name-prefix (:block/uuid property))]
+  (let [page-name (str db-property-util/hidden-page-name-prefix (:db/ident property))]
     (or (db/entity [:block/name page-name])
         (db-property-util/build-property-hidden-page property))))