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

Fix another nested boolean case

Browse Source 
Also removed or nested complexity from
903a757ce2 that no longer seems necessary
This commit is contained in:
Gabriel Horner
2022-03-10 13:40:37 -05:00
committed by Tienson Qin
parent 3a19687988
commit 5f0efcf2d8
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,23 +142,21 @@
(coll? (first clauses))
(cond
(= current-filter 'not)
(->> (apply concat clauses)
(apply list fe))
(cons 'and clauses)
(or (= current-filter 'or)
nested-and?)
(if (list? (first clauses))
(cons 'and clauses)
(apply concat clauses))
(cons 'and clauses)
:else
(->> (map (fn [result]
(->> clauses
(map (fn [result]
(if (list? result)
result
(let [result (if (vector? (ffirst result))
(apply concat result)
result)]
(cons 'and (seq result))))) clauses)
(cons 'and (seq result))))))
(apply list fe)))
:else
@@ -183,12 +181,6 @@
fe clauses current-filter nested-and?)
vars' (set/union (set @vars) (collect-vars result))
query (cond
;; TODO: more thoughts
(and (= current-filter 'and)
(= 'or fe)
(= #{'?b} vars'))
[(concat result [['?b]])]
nested-and?
result