Sfoglia il codice sorgente

fix: db graph test

Tienson Qin 11 mesi fa
parent
commit
b9b38ceace

+ 0 - 14
deps/db/src/logseq/db/frontend/property.cljs

@@ -163,20 +163,6 @@
                             :schema {:type :datetime
                                      :public? false
                                      :hide? true}}
-     :logseq.property.attribute/property-schema-classes
-     {:title "Property classes"
-      :attribute :property/schema.classes
-      :schema {:type :entity
-               :cardinality :many
-               :public? false
-               :hide? true}}
-     :logseq.property.attribute/property-value-content
-     {:title "Property value"
-      :attribute :property.value/content
-      :schema {:type :any
-               :public? false
-               :hide? true}}
-
      :logseq.property.node/display-type {:title "Node Display Type"
                                          :schema {:type :keyword
                                                   :public? false

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

@@ -19,8 +19,9 @@
 (defn build-initial-properties*
   [built-in-properties]
   (mapcat
-   (fn [[db-ident {:keys [schema title closed-values properties] :as m}]]
-     (let [prop-name (or title (name (:name m)))
+   (fn [[db-ident {:keys [attribute schema title closed-values properties] :as m}]]
+     (let [db-ident (or attribute db-ident)
+           prop-name (or title (name (:name m)))
            [property & others] (if closed-values
                                  (db-property-build/build-closed-values
                                   db-ident

+ 5 - 4
deps/db/src/logseq/db/sqlite/util.cljs

@@ -72,8 +72,12 @@
    (fn [r k v]
      (if (qualified-keyword? k)
        (assoc r k v)
-       (if (= k :cardinality)
+       (cond
+         (= k :cardinality)
          (assoc r :db/cardinality v)
+         (= k :classes)
+         (assoc r :property/schema.classes v)
+         :else
          (assoc r (keyword "property" k) v))))
    {}
    prop-schema))
@@ -90,7 +94,6 @@
                      db-ident
                      (db-property/create-user-property-ident-from-name (name db-ident)))
          prop-name (or title (name db-ident'))
-         classes (:classes prop-schema')
          prop-schema (schema->qualified-property-keyword prop-schema')
          prop-type (get prop-schema :property/type :default)]
      (merge
@@ -108,8 +111,6 @@
                            :db.cardinality/many
                            :db.cardinality/one)
          :block/order (db-order/gen-key)}
-         (seq classes)
-         (assoc :property/schema.classes classes)
          (or ref-type? (contains? db-property-type/all-ref-property-types prop-type))
          (assoc :db/valueType :db.type/ref)
          (seq properties)

BIN
scripts/db-graph-with-props/db.sqlite