Skip to content

Commit 0964331

Browse files
chore: move 2 more db namespaces to db.common
b/c they are used by both graph types
1 parent 73cff9d commit 0964331

File tree

15 files changed

+20
-19
lines changed

15 files changed

+20
-19
lines changed

.clj-kondo/config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
logseq.db.frontend.validate db-validate
185185
logseq.db.sqlite.build sqlite-build
186186
logseq.db.sqlite.cli sqlite-cli
187-
logseq.db.sqlite.common-db sqlite-common-db
187+
logseq.db.common.sqlite sqlite-common-db
188188
logseq.db.sqlite.create-graph sqlite-create-graph
189189
logseq.db.sqlite.export sqlite-export
190190
logseq.db.sqlite.util sqlite-util

deps/db/.carve/config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{:paths ["src"]
2-
:api-namespaces [logseq.db.sqlite.common-db
2+
:api-namespaces [logseq.db.common.sqlite
33
logseq.db.sqlite.util
44
logseq.db.sqlite.cli
55
logseq.db.frontend.property

deps/db/.clj-kondo/config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
logseq.db.frontend.validate db-validate
2727
logseq.db.sqlite.build sqlite-build
2828
logseq.db.sqlite.cli sqlite-cli
29-
logseq.db.sqlite.common-db sqlite-common-db
29+
logseq.db.common.sqlite sqlite-common-db
3030
logseq.db.sqlite.create-graph sqlite-create-graph
3131
logseq.db.sqlite.export sqlite-export
3232
logseq.db.sqlite.util sqlite-util}}}

deps/db/src/logseq/db.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
[logseq.common.util.page-ref :as page-ref]
1313
[logseq.common.uuid :as common-uuid]
1414
[logseq.db.frontend.class :as db-class]
15-
[logseq.db.frontend.delete-blocks :as delete-blocks] ;; Load entity extensions
15+
[logseq.db.common.delete-blocks :as delete-blocks] ;; Load entity extensions
1616
[logseq.db.frontend.entity-plus :as entity-plus]
1717
[logseq.db.frontend.entity-util :as entity-util]
1818
[logseq.db.frontend.property :as db-property]
1919
[logseq.db.frontend.rules :as rules]
20-
[logseq.db.sqlite.common-db :as sqlite-common-db]
20+
[logseq.db.common.sqlite :as sqlite-common-db]
2121
[logseq.db.sqlite.util :as sqlite-util]
2222
[logseq.db.file-based.rules :as file-rules])
2323
(:refer-clojure :exclude [object?]))

deps/db/src/logseq/db/frontend/delete_blocks.cljs renamed to deps/db/src/logseq/db/common/delete_blocks.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
(ns logseq.db.frontend.delete-blocks
2-
"Delete refs/macros when deleting blocks"
1+
(ns logseq.db.common.delete-blocks
2+
"For file and DB graphs, provides fn to handle any deletion to occur per ldb/transact!"
33
(:require [clojure.string :as string]
44
[datascript.core :as d]
55
[logseq.common.util :as common-util]

deps/db/src/logseq/db/sqlite/common_db.cljs renamed to deps/db/src/logseq/db/common/sqlite.cljs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
(ns logseq.db.sqlite.common-db
2-
"Common sqlite db fns for browser and node"
1+
(ns logseq.db.common.sqlite
2+
"Provides common sqlite db fns for file and DB graphs. These fns work on
3+
browser and node"
34
(:require ["path" :as node-path]
45
[clojure.set :as set]
56
[clojure.string :as string]

deps/db/src/logseq/db/sqlite/cli.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns ^:node-only logseq.db.sqlite.cli
22
"Primary ns to interact with DB files for DB and file graphs with node.js based CLIs"
33
(:require ["better-sqlite3" :as sqlite3]
4-
[logseq.db.sqlite.common-db :as sqlite-common-db]
4+
[logseq.db.common.sqlite :as sqlite-common-db]
55
;; FIXME: datascript.core has to come before datascript.storage or else nbb fails
66
#_:clj-kondo/ignore
77
[datascript.core :as d]

deps/db/test/logseq/db/sqlite/common_db_test.cljs renamed to deps/db/test/logseq/db/common/sqlite_test.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
(ns logseq.db.sqlite.common-db-test
1+
(ns logseq.db.common.sqlite-test
22
(:require [cljs.test :refer [deftest async use-fixtures is testing]]
33
["fs" :as fs]
44
["path" :as node-path]
55
[datascript.core :as d]
6-
[logseq.db.sqlite.common-db :as sqlite-common-db]
6+
[logseq.db.common.sqlite :as sqlite-common-db]
77
[logseq.common.util.date-time :as date-time-util]
88
[logseq.db.sqlite.cli :as sqlite-cli]
99
[clojure.string :as string]))

src/electron/electron/db.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
(:require ["path" :as node-path]
44
["fs-extra" :as fs]
55
["electron" :refer [app]]
6-
[logseq.db.sqlite.common-db :as sqlite-common-db]))
6+
[logseq.db.common.sqlite :as sqlite-common-db]))
77

88
(defn get-graphs-dir
99
[]

src/electron/electron/handler.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
[electron.window :as win]
3232
[goog.functions :refer [debounce]]
3333
[logseq.common.graph :as common-graph]
34-
[logseq.db.sqlite.common-db :as sqlite-common-db]
34+
[logseq.db.common.sqlite :as sqlite-common-db]
3535
[logseq.db.sqlite.util :as sqlite-util]
3636
[promesa.core :as p]))
3737

0 commit comments

Comments
 (0)