From a0ee41ca86d612f4bcd568ce4bbd9504da70f0f2 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Fri, 16 May 2025 11:44:16 -0400 Subject: [PATCH] fix: db graph cljs tests need repeatable idents Also remove unused ldb fn --- deps/db/src/logseq/db.cljs | 1 - deps/db/src/logseq/db/frontend/db.cljs | 5 ----- deps/db/src/logseq/db/frontend/db_ident.cljc | 2 +- deps/db/test/logseq/db_test.cljs | 12 +----------- src/main/frontend/db/model.cljs | 5 ----- 5 files changed, 2 insertions(+), 23 deletions(-) diff --git a/deps/db/src/logseq/db.cljs b/deps/db/src/logseq/db.cljs index 10f30fba5e..08f49dc0a9 100644 --- a/deps/db/src/logseq/db.cljs +++ b/deps/db/src/logseq/db.cljs @@ -505,7 +505,6 @@ e)))))) (def built-in? entity-util/built-in?) -(def get-classes-with-property db-db/get-classes-with-property) (def built-in-class-property? db-db/built-in-class-property?) (def private-built-in-page? db-db/private-built-in-page?) diff --git a/deps/db/src/logseq/db/frontend/db.cljs b/deps/db/src/logseq/db/frontend/db.cljs index 5d83ec31f0..031d062ab0 100644 --- a/deps/db/src/logseq/db/frontend/db.cljs +++ b/deps/db/src/logseq/db/frontend/db.cljs @@ -9,11 +9,6 @@ [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property])) -(defn get-classes-with-property - "Get classes which have given property as a class property" - [db property-id] - (:logseq.property.class/_properties (d/entity db property-id))) - (defn built-in-class-property? "Whether property a built-in property for the specific class" [class-entity property-entity] diff --git a/deps/db/src/logseq/db/frontend/db_ident.cljc b/deps/db/src/logseq/db/frontend/db_ident.cljc index 20e67e53f4..6c8d1b2929 100644 --- a/deps/db/src/logseq/db/frontend/db_ident.cljc +++ b/deps/db/src/logseq/db/frontend/db_ident.cljc @@ -68,7 +68,7 @@ (assert (not (re-find #"^(logseq|block)(\.|$)" (name user-namespace))) "New ident is not allowed to use an internal namespace") (if #?(:org.babashka/nbb true - :cljs js/process.env.REPEATABLE_IDENTS + :cljs (or js/process.env.REPEATABLE_IDENTS js/process.env.DB_GRAPH) :default false) ;; Used for contexts where we want repeatable idents e.g. tests and CLIs (keyword user-namespace (-> name-string (string/replace #"[/()]|\s+" "-") (string/replace-first #"^(\d)" "NUM-$1"))) diff --git a/deps/db/test/logseq/db_test.cljs b/deps/db/test/logseq/db_test.cljs index aa2b5a4fc2..4739038b2c 100644 --- a/deps/db/test/logseq/db_test.cljs +++ b/deps/db/test/logseq/db_test.cljs @@ -82,14 +82,4 @@ "Class pages correctly found for given class") (is (= nil (ldb/page-exists? @conn "movie" #{:logseq.class/Property})) - "Class pages correctly not found for given class"))) - -(deftest get-classes-with-property-test - (let [conn (db-test/create-conn-with-blocks - {:properties {:prop1 {:logseq.property/type :default}} - :classes - {:Class1 {:build/class-properties [:prop1]} - :Class2 {:build/class-properties [:prop1]}}}) - classes (ldb/get-classes-with-property @conn :user.property/prop1)] - (is (= ["Class1" "Class2"] - (map :block/title classes))))) \ No newline at end of file + "Class pages correctly not found for given class"))) \ No newline at end of file diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs index 484ac5ccb7..887c34ac64 100644 --- a/src/main/frontend/db/model.cljs +++ b/src/main/frontend/db/model.cljs @@ -445,11 +445,6 @@ independent of format as format specific heading characters are stripped" [page-name] (ldb/journal? (ldb/get-page (conn/get-db) page-name))) -(defn get-classes-with-property - "Get classes which have given property as a class property" - [property-id] - (ldb/get-classes-with-property (conn/get-db) property-id)) - (defn get-all-referenced-blocks-uuid "Get all uuids of blocks with any back link exists." []