clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-01 09:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: mix query dsl and datalog clauses

Browse Source
This commit is contained in:
Tienson Qin
2024-10-14 05:44:07 +08:00
parent e3555f524d
commit 7cd208a51c
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/frontend/db/query_dsl.cljs
View File

@@ -471,6 +471,15 @@
{:query (list 'block-content '?b e)
:rules [:block-content]})
(defn- datalog-clause?
[e]
(and
(coll? e)
(or
(list? (first e))
(and (= 3 (count e))
(string/starts-with? (str (first e)) "?")))))
(defn build-query
"This fn converts a form/list in a query e.g. `(operator arg1 arg2)` to its datalog
equivalent. This fn is called recursively on sublists for boolean operators
@@ -485,7 +494,10 @@ Some bindings in this fn:
([e {:keys [sort-by blocks? sample] :as env :or {blocks? (atom nil)}} level]
; {:post [(or (nil? %) (map? %))]}
(let [fe (first e)
fe (when fe (symbol (string/lower-case (name fe))))
fe (when fe
(if (list? fe)
fe
(symbol (string/lower-case (name fe)))))
page-ref? (page-ref/page-ref? e)]
(when (or (and page-ref?
(not (contains? #{'page-property 'page-tags} (:current-filter env))))
@@ -496,6 +508,9 @@ Some bindings in this fn:
(nil? e)
nil
(and (:db-graph? env) (datalog-clause? e))
{:query [e]}
page-ref?
(build-page-ref e)
@@ -704,16 +719,17 @@ Some bindings in this fn:
(query repo query-string {}))
([repo query-string query-opts]
(when (and (string? query-string) (not= "\"\"" query-string))
(let [{query* :query :keys [rules sort-by blocks? sample]} (parse-query query-string {:cards? (:cards? query-opts)})
(let [db-graph? (config/db-based-graph? repo)
{query* :query :keys [rules sort-by blocks? sample]} (parse-query query-string {:cards? (:cards? query-opts)})
query* (if (:cards? query-opts)
(let [card-id (:db/id (db-utils/entity :logseq.class/Card))]
(util/concat-without-nil
[['?b :block/tags card-id]]
(if (coll? (first query*)) query* [query*])))
query*)]
query*)
blocks? (if db-graph? true blocks?)]
(when-let [query' (some-> query* (query-wrapper {:blocks? blocks?
:block-attrs (when (config/db-based-graph? repo)
db-block-attrs)}))]
:block-attrs (when db-graph? db-block-attrs)}))]
(let [random-samples (if @sample
(fn [col]
(take @sample (shuffle col)))