diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index 7a2aebf714..e04c0bf9ec 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -45,7 +45,7 @@ rum.core/use-layout-effect! {:message "Use frontend.hooks/use-layout-effect! instead" :level :info} rum.core/use-callback {:message "Use frontend.hooks/use-callback instead" :level :info}} :unused-namespace {:level :warning - :exclude [logseq.db.frontend.entity-plus]} + :exclude [logseq.db.common.entity-plus]} ;; TODO:lint: Remove node-path excludes once we have a cleaner api :unresolved-var {:exclude [frontend.util/node-path.basename @@ -185,7 +185,7 @@ logseq.db.frontend.content db-content logseq.db.frontend.db db-db logseq.db.frontend.db-ident db-ident - logseq.db.frontend.entity-plus entity-plus + logseq.db.common.entity-plus entity-plus logseq.db.frontend.entity-util entity-util logseq.db.frontend.inputs db-inputs logseq.db.frontend.property db-property diff --git a/deps/db/.clj-kondo/config.edn b/deps/db/.clj-kondo/config.edn index 53cd1bd430..b8fd64674c 100644 --- a/deps/db/.clj-kondo/config.edn +++ b/deps/db/.clj-kondo/config.edn @@ -25,7 +25,7 @@ logseq.db.file-based.rules file-rules logseq.db.file-based.schema file-schema logseq.db.file-based.entity-util file-entity-util - logseq.db.frontend.entity-plus entity-plus + logseq.db.common.entity-plus entity-plus logseq.db.frontend.rules rules logseq.db.frontend.schema db-schema logseq.db.frontend.validate db-validate diff --git a/deps/db/src/logseq/db.cljs b/deps/db/src/logseq/db.cljs index 3b58d3c6a5..8938911e8c 100644 --- a/deps/db/src/logseq/db.cljs +++ b/deps/db/src/logseq/db.cljs @@ -10,14 +10,16 @@ [logseq.common.util :as common-util] [logseq.common.uuid :as common-uuid] [logseq.db.common.delete-blocks :as delete-blocks] ;; Load entity extensions + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.common.entity-util :as common-entity-util] [logseq.db.common.sqlite :as sqlite-common-db] + [logseq.db.file-based.schema :as file-schema] [logseq.db.frontend.class :as db-class] [logseq.db.frontend.db :as db-db] - [logseq.db.frontend.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.rules :as rules] + [logseq.db.frontend.schema :as db-schema] [logseq.db.sqlite.util :as sqlite-util]) (:refer-clojure :exclude [object?])) @@ -578,3 +580,10 @@ :where [?page :block/tags ?tag]] db)) + +(defn get-schema + "Returns schema for given repo" + [repo] + (if (db-based-graph? repo) + db-schema/schema + file-schema/schema)) \ No newline at end of file diff --git a/deps/db/src/logseq/db/common/delete_blocks.cljs b/deps/db/src/logseq/db/common/delete_blocks.cljs index 4796c9923f..ef2ea8b5b9 100644 --- a/deps/db/src/logseq/db/common/delete_blocks.cljs +++ b/deps/db/src/logseq/db/common/delete_blocks.cljs @@ -6,7 +6,7 @@ [logseq.common.util.block-ref :as block-ref] [logseq.common.util.page-ref :as page-ref] [logseq.db.common.entity-util :as common-entity-util] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util])) (defn- replace-ref-with-deleted-block-title diff --git a/deps/db/src/logseq/db/frontend/entity_plus.cljc b/deps/db/src/logseq/db/common/entity_plus.cljc similarity index 98% rename from deps/db/src/logseq/db/frontend/entity_plus.cljc rename to deps/db/src/logseq/db/common/entity_plus.cljc index 135b8d582f..dfbeeedf9a 100644 --- a/deps/db/src/logseq/db/frontend/entity_plus.cljc +++ b/deps/db/src/logseq/db/common/entity_plus.cljc @@ -1,4 +1,4 @@ -(ns logseq.db.frontend.entity-plus +(ns logseq.db.common.entity-plus "Add map ops such as assoc/dissoc to datascript Entity. NOTE: This doesn't work for nbb/sci yet because of https://github.com/babashka/sci/issues/639" @@ -58,7 +58,7 @@ ;; FIXME: Correct dependency ordering instead of resolve workaround #?(:org.babashka/nbb false :cljs (when-let [f (resolve 'frontend.common.missionary/background-task-running?)] - (f :logseq.db.frontend.entity-plus/reset-immutable-entities-cache!))))) + (f :logseq.db.common.entity-plus/reset-immutable-entities-cache!))))) (defn entity-memoized [db eid] diff --git a/deps/db/src/logseq/db/common/property_util.cljs b/deps/db/src/logseq/db/common/property_util.cljs index 147b50a446..1d761acd25 100644 --- a/deps/db/src/logseq/db/common/property_util.cljs +++ b/deps/db/src/logseq/db/common/property_util.cljs @@ -1,7 +1,7 @@ (ns logseq.db.common.property-util "Property related util fns. Fns used in both DB and file graphs should go here" (:require [datascript.core :as d] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] [logseq.db.sqlite.util :as sqlite-util])) diff --git a/deps/db/src/logseq/db/common/sqlite.cljs b/deps/db/src/logseq/db/common/sqlite.cljs index f934e66f7c..57bb956e74 100644 --- a/deps/db/src/logseq/db/common/sqlite.cljs +++ b/deps/db/src/logseq/db/common/sqlite.cljs @@ -11,7 +11,7 @@ [logseq.common.util.date-time :as date-time-util] [logseq.db.common.entity-util :as common-entity-util] [logseq.db.common.order :as db-order] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.sqlite.util :as sqlite-util])) @@ -349,9 +349,16 @@ (or (d/restore-conn storage) (d/create-conn schema {:storage storage}))) +(defonce file-version-prefix "logseq_local_") + +(defn local-file-based-graph? + [s] + (and (string? s) + (string/starts-with? s file-version-prefix))) + (defn sanitize-db-name [db-name] - (if (string/starts-with? db-name sqlite-util/file-version-prefix) + (if (string/starts-with? db-name file-version-prefix) (-> db-name (string/replace ":" "+3A+") (string/replace "/" "++")) diff --git a/deps/db/src/logseq/db/common/view.cljs b/deps/db/src/logseq/db/common/view.cljs index 9a167e842c..74926a8c28 100644 --- a/deps/db/src/logseq/db/common/view.cljs +++ b/deps/db/src/logseq/db/common/view.cljs @@ -9,7 +9,7 @@ [logseq.common.util :as common-util] [logseq.db :as ldb] [logseq.db.frontend.class :as db-class] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/db/src/logseq/db/frontend/malli_schema.cljs b/deps/db/src/logseq/db/frontend/malli_schema.cljs index b2bc8c2acd..fa0be75713 100644 --- a/deps/db/src/logseq/db/frontend/malli_schema.cljs +++ b/deps/db/src/logseq/db/frontend/malli_schema.cljs @@ -5,7 +5,7 @@ [datascript.core :as d] [logseq.db.common.order :as db-order] [logseq.db.frontend.class :as db-class] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.property.type :as db-property-type] diff --git a/deps/db/src/logseq/db/sqlite/cli.cljs b/deps/db/src/logseq/db/sqlite/cli.cljs index 8aee6f57c2..6e47cd7bcb 100644 --- a/deps/db/src/logseq/db/sqlite/cli.cljs +++ b/deps/db/src/logseq/db/sqlite/cli.cljs @@ -90,7 +90,7 @@ (let [[_db-sanitized-name db-full-path] (sqlite-common-db/get-db-full-path graphs-dir db-name) db (new sqlite db-full-path nil) ;; For both desktop and CLI, only file graphs have db-name that indicate their db type - schema (if (sqlite-util/local-file-based-graph? db-name) + schema (if (sqlite-common-db/local-file-based-graph? db-name) file-schema/schema db-schema/schema)] (sqlite-common-db/create-kvs-table! db) diff --git a/deps/db/src/logseq/db/sqlite/create_graph.cljs b/deps/db/src/logseq/db/sqlite/create_graph.cljs index 88b7e3ab42..7c870d1cb9 100644 --- a/deps/db/src/logseq/db/sqlite/create_graph.cljs +++ b/deps/db/src/logseq/db/sqlite/create_graph.cljs @@ -170,7 +170,7 @@ (build-initial-classes* db-class/built-in-classes db-ident->properties)) (defn build-initial-views - "Builds initial blocks used for storing views. Used by db and file graphs" + "Builds initial blocks used for storing views" [] (let [page-id (common-uuid/gen-uuid :builtin-block-uuid common-config/views-page-name)] [(sqlite-util/block-with-timestamps diff --git a/deps/db/src/logseq/db/sqlite/export.cljs b/deps/db/src/logseq/db/sqlite/export.cljs index 0e398d8647..52d1b1cd1b 100644 --- a/deps/db/src/logseq/db/sqlite/export.cljs +++ b/deps/db/src/logseq/db/sqlite/export.cljs @@ -10,7 +10,7 @@ [logseq.db.frontend.class :as db-class] [logseq.db.frontend.content :as db-content] [logseq.db.frontend.db :as db-db] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.property :as db-property] [logseq.db.sqlite.build :as sqlite-build] diff --git a/deps/db/src/logseq/db/sqlite/util.cljs b/deps/db/src/logseq/db/sqlite/util.cljs index 437d66e15f..74ab902c00 100644 --- a/deps/db/src/logseq/db/sqlite/util.cljs +++ b/deps/db/src/logseq/db/sqlite/util.cljs @@ -9,13 +9,10 @@ [logseq.common.util :as common-util] [logseq.common.uuid :as common-uuid] [logseq.db.common.order :as db-order] - [logseq.db.file-based.schema :as file-schema] [logseq.db.frontend.property :as db-property] - [logseq.db.frontend.property.type :as db-property-type] - [logseq.db.frontend.schema :as db-schema])) + [logseq.db.frontend.property.type :as db-property-type])) (defonce db-version-prefix "logseq_db_") -(defonce file-version-prefix "logseq_local_") (def ^:private write-handlers (cljs-bean.transit/writer-handlers)) (def ^:private read-handlers {}) @@ -59,18 +56,6 @@ (when graph-name (string/starts-with? graph-name db-version-prefix))) -(defn local-file-based-graph? - [s] - (and (string? s) - (string/starts-with? s file-version-prefix))) - -(defn get-schema - "Returns schema for given repo" - [repo] - (if (db-based-graph? repo) - db-schema/schema - file-schema/schema)) - (def block-with-timestamps common-util/block-with-timestamps) (defn build-new-property diff --git a/deps/db/src/logseq/db/test/helper.cljs b/deps/db/src/logseq/db/test/helper.cljs index 76d3c88ea3..7447f83b6b 100644 --- a/deps/db/src/logseq/db/test/helper.cljs +++ b/deps/db/src/logseq/db/test/helper.cljs @@ -2,7 +2,7 @@ "Main ns for providing test fns for DB graphs" (:require [datascript.core :as d] [datascript.impl.entity :as de] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.property :as db-property] [logseq.db.frontend.schema :as db-schema] [logseq.db.sqlite.build :as sqlite-build] diff --git a/deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs b/deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs index a085a48bd9..efff71f4ce 100644 --- a/deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs +++ b/deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs @@ -10,7 +10,7 @@ [logseq.common.util.date-time :as date-time-util] [logseq.db :as ldb] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.malli-schema :as db-malli-schema] [logseq.db.frontend.rules :as rules] [logseq.db.frontend.validate :as db-validate] diff --git a/deps/outliner/src/logseq/outliner/pipeline.cljs b/deps/outliner/src/logseq/outliner/pipeline.cljs index c24744d980..179e8aea51 100644 --- a/deps/outliner/src/logseq/outliner/pipeline.cljs +++ b/deps/outliner/src/logseq/outliner/pipeline.cljs @@ -6,7 +6,7 @@ [logseq.common.util.date-time :as date-time-util] [logseq.db :as ldb] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.property :as db-property] [logseq.outliner.datascript-report :as ds-report])) diff --git a/deps/outliner/src/logseq/outliner/property.cljs b/deps/outliner/src/logseq/outliner/property.cljs index 7edb4de5a3..76e8ab8eef 100644 --- a/deps/outliner/src/logseq/outliner/property.cljs +++ b/deps/outliner/src/logseq/outliner/property.cljs @@ -8,7 +8,7 @@ [logseq.db :as ldb] [logseq.db.common.order :as db-order] [logseq.db.frontend.db-ident :as db-ident] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.malli-schema :as db-malli-schema] [logseq.db.frontend.property :as db-property] diff --git a/deps/outliner/test/logseq/outliner/validate_test.cljs b/deps/outliner/test/logseq/outliner/validate_test.cljs index 790ea3c774..3b3acb101c 100644 --- a/deps/outliner/test/logseq/outliner/validate_test.cljs +++ b/deps/outliner/test/logseq/outliner/validate_test.cljs @@ -1,7 +1,7 @@ (ns logseq.outliner.validate-test (:require [cljs.test :refer [are deftest is testing]] [datascript.core :as d] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.test.helper :as db-test] [logseq.outliner.validate :as outliner-validate])) diff --git a/deps/publishing/src/logseq/publishing/db.cljs b/deps/publishing/src/logseq/publishing/db.cljs index d427fca4e6..d0bb382229 100644 --- a/deps/publishing/src/logseq/publishing/db.cljs +++ b/deps/publishing/src/logseq/publishing/db.cljs @@ -3,7 +3,7 @@ (:require [clojure.set :as set] [clojure.string :as string] [datascript.core :as d] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.malli-schema :as db-malli-schema] [logseq.db.frontend.rules :as rules])) diff --git a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj index 7f47c21fdc..eafd63752e 100644 --- a/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj +++ b/scripts/src/logseq/tasks/dev/db_and_file_graphs.clj @@ -98,8 +98,7 @@ (defn- validate-multi-graph-fns-not-in-file-or-db [] - ;; TODO: Lint `(db-based-graph?` when db.frontend.entity-plus is split into separate graph contexts - (let [multi-graph-fns ["/db-based-graph\\?" + (let [multi-graph-fns ["/db-based-graph\\?" "\\(db-based-graph\\?" ;; Use file-entity-util and entity-util when in a single graph context "ldb/whiteboard\\?" "ldb/journal\\?" "ldb/page\\?"] res (grep-many multi-graph-fns (into file-graph-paths db-graph-paths))] diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs index 43626b53fd..910e7df067 100644 --- a/src/electron/electron/handler.cljs +++ b/src/electron/electron/handler.cljs @@ -240,7 +240,7 @@ (remove (fn [s] (= s db/unlinked-graphs-dir))) (map graph-name->path) (map (fn [s] - (if (string/starts-with? s sqlite-util/file-version-prefix) + (if (string/starts-with? s sqlite-common-db/file-version-prefix) s (str sqlite-util/db-version-prefix s))))))) diff --git a/src/main/frontend/background_tasks.cljs b/src/main/frontend/background_tasks.cljs index bfa17c4beb..0cd87e5748 100644 --- a/src/main/frontend/background_tasks.cljs +++ b/src/main/frontend/background_tasks.cljs @@ -2,11 +2,11 @@ "Some background tasks" (:require [frontend.common.missionary :as c.m] [frontend.flows :as flows] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [missionary.core :as m])) (c.m/run-background-task - :logseq.db.frontend.entity-plus/reset-immutable-entities-cache! + :logseq.db.common.entity-plus/reset-immutable-entities-cache! (m/reduce (fn [_ repo] (when (some? repo) diff --git a/src/main/frontend/common/file/core.cljs b/src/main/frontend/common/file/core.cljs index dfa873901c..1b2c89e5c5 100644 --- a/src/main/frontend/common/file/core.cljs +++ b/src/main/frontend/common/file/core.cljs @@ -5,7 +5,7 @@ [datascript.core :as d] [logseq.db :as ldb] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.sqlite.util :as sqlite-util] [logseq.graph-parser.property :as gp-property] [logseq.outliner.tree :as otree])) diff --git a/src/main/frontend/common/graph_view.cljs b/src/main/frontend/common/graph_view.cljs index d677f4aa52..baffe4c10d 100644 --- a/src/main/frontend/common/graph_view.cljs +++ b/src/main/frontend/common/graph_view.cljs @@ -6,7 +6,7 @@ [logseq.common.util :as common-util] [logseq.db :as ldb] [logseq.db.common.property-util :as db-property-util] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.sqlite.create-graph :as sqlite-create-graph] [logseq.graph-parser.db :as gp-db])) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 36a34ac01e..9bfdf4cbe7 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -80,7 +80,7 @@ [logseq.common.util.page-ref :as page-ref] [logseq.db :as ldb] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.graph-parser.block :as gp-block] [logseq.graph-parser.mldoc :as gp-mldoc] [logseq.graph-parser.text :as text] diff --git a/src/main/frontend/db/utils.cljs b/src/main/frontend/db/utils.cljs index bf80804e19..fc2ca35fc5 100644 --- a/src/main/frontend/db/utils.cljs +++ b/src/main/frontend/db/utils.cljs @@ -4,7 +4,7 @@ [frontend.db.conn :as conn] [frontend.state :as state] [logseq.db.frontend.content :as db-content] - [logseq.db.frontend.entity-plus :as entity-plus])) + [logseq.db.common.entity-plus :as entity-plus])) ;; transit serialization diff --git a/src/main/frontend/extensions/fsrs.cljs b/src/main/frontend/extensions/fsrs.cljs index e5599ef73d..44685ffff1 100644 --- a/src/main/frontend/extensions/fsrs.cljs +++ b/src/main/frontend/extensions/fsrs.cljs @@ -18,7 +18,7 @@ [frontend.ui :as ui] [frontend.util :as util] [logseq.db :as ldb] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.shui.ui :as shui] [missionary.core :as m] [open-spaced-repetition.cljc-fsrs.core :as fsrs.core] diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs index 4da5a6ea14..b14e9818a0 100644 --- a/src/main/frontend/handler/editor.cljs +++ b/src/main/frontend/handler/editor.cljs @@ -55,7 +55,7 @@ [logseq.common.util.page-ref :as page-ref] [logseq.db :as ldb] [logseq.db.file-based.schema :as file-schema] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.property :as db-property] [logseq.graph-parser.block :as gp-block] [logseq.graph-parser.mldoc :as gp-mldoc] diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs index 953a3debe3..bb941be7bb 100644 --- a/src/main/frontend/state.cljs +++ b/src/main/frontend/state.cljs @@ -21,7 +21,7 @@ [goog.object :as gobj] [logseq.common.config :as common-config] [logseq.db :as ldb] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.sqlite.util :as sqlite-util] [logseq.shui.dialog.core :as shui-dialog] [logseq.shui.hooks :as hooks] diff --git a/src/main/frontend/worker/db/fix.cljs b/src/main/frontend/worker/db/fix.cljs index b598ba7235..dd6a2f2686 100644 --- a/src/main/frontend/worker/db/fix.cljs +++ b/src/main/frontend/worker/db/fix.cljs @@ -1,11 +1,11 @@ (ns frontend.worker.db.fix "fix db" (:require [datascript.core :as d] - [logseq.db.sqlite.util :as sqlite-util])) + [logseq.db :as ldb])) (defn check-and-fix-schema! [repo conn] - (let [schema (sqlite-util/get-schema repo) + (let [schema (ldb/get-schema repo) db-schema (:schema @conn) diffs (->> (keep (fn [[k v]] (let [schema-v (-> (get db-schema k) diff --git a/src/main/frontend/worker/db_worker.cljs b/src/main/frontend/worker/db_worker.cljs index adbb71aa2d..b96ad52a74 100644 --- a/src/main/frontend/worker/db_worker.cljs +++ b/src/main/frontend/worker/db_worker.cljs @@ -37,7 +37,7 @@ [logseq.db.common.order :as db-order] [logseq.db.common.sqlite :as sqlite-common-db] [logseq.db.common.view :as db-view] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.schema :as db-schema] [logseq.db.sqlite.create-graph :as sqlite-create-graph] [logseq.db.sqlite.export :as sqlite-export] @@ -334,7 +334,7 @@ (db-migrate/migrate-sqlite-db db) (when-not @*publishing? (db-migrate/migrate-sqlite-db client-ops-db)) (search/create-tables-and-triggers! search-db) - (let [schema (sqlite-util/get-schema repo) + (let [schema (ldb/get-schema repo) conn (sqlite-common-db/get-storage-conn storage schema) _ (db-fix/check-and-fix-schema! repo conn) _ (when datoms diff --git a/src/main/frontend/worker/handler/page/db_based/page.cljs b/src/main/frontend/worker/handler/page/db_based/page.cljs index 738cf189fa..eb5ac6ea64 100644 --- a/src/main/frontend/worker/handler/page/db_based/page.cljs +++ b/src/main/frontend/worker/handler/page/db_based/page.cljs @@ -9,7 +9,7 @@ [logseq.db.common.order :as db-order] [logseq.db.common.property-util :as db-property-util] [logseq.db.frontend.class :as db-class] - [logseq.db.frontend.entity-plus :as entity-plus] + [logseq.db.common.entity-plus :as entity-plus] [logseq.db.frontend.entity-util :as entity-util] [logseq.db.frontend.malli-schema :as db-malli-schema] [logseq.db.frontend.property.build :as db-property-build] diff --git a/src/main/frontend/worker/pipeline.cljs b/src/main/frontend/worker/pipeline.cljs index 05e68039dc..f0b608d3c7 100644 --- a/src/main/frontend/worker/pipeline.cljs +++ b/src/main/frontend/worker/pipeline.cljs @@ -12,6 +12,7 @@ [logseq.common.util :as common-util] [logseq.common.uuid :as common-uuid] [logseq.db :as ldb] + [logseq.db.common.sqlite :as sqlite-common-db] [logseq.db.frontend.validate :as db-validate] [logseq.db.sqlite.export :as sqlite-export] [logseq.db.sqlite.util :as sqlite-util] @@ -232,7 +233,7 @@ :db-after (:db-after result))) tx-report) {:keys [pages blocks]} (ds-report/get-blocks-and-pages tx-report*) - _ (when (sqlite-util/local-file-based-graph? repo) + _ (when (sqlite-common-db/local-file-based-graph? repo) (let [page-ids (distinct (map :db/id pages))] (doseq [page-id page-ids] (when (d/entity @conn page-id)