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

fix: mixing datalog clauses with dsl query

Browse Source
This commit is contained in:
Tienson Qin
2024-11-04 13:23:10 +08:00
parent 38b0e1bfe3
commit 11955e1443
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,7 +478,11 @@
(or
(list? (first e))
(and (>= (count e) 2)
(string/starts-with? (str (first e)) "?")))))
(or
;; variable
(string/starts-with? (str (first e)) "?")
;; function
(list? (first e)))))))
(defn build-query
"This fn converts a form/list in a query e.g. `(operator arg1 arg2)` to its datalog
@@ -499,17 +503,20 @@ Some bindings in this fn:
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))))
(contains? #{'between 'property 'todo 'task 'priority 'page} fe)
(and (not page-ref?) (string? e)))
(when (or
(:db-graph? env)
(and page-ref?
(not (contains? #{'page-property 'page-tags} (:current-filter env))))
(contains? #{'between 'property 'todo 'task 'priority 'page} fe)
(and (not page-ref?) (string? e)))
(reset! blocks? true))
(cond
(nil? e)
nil
(and (:db-graph? env) (datalog-clause? e))
{:query [e]}
{:query [e]
:rules []}
page-ref?
(build-page-ref e)