clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-04 19:06:21 +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

33
src/test/frontend/db/query_dsl_test.cljs
View File

@@ -245,22 +245,28 @@ prop-d:: nada"}])
- DONE b1 [[page 1]]
- DONE b2 [[page 1]]"}
{:file/path "pages/page2.md"
:file/content "foo::bar
:file/content "foo:: bar
- NOW b3 [[page 1]]
- LATER b4 [[page 2]]
"}])
(is (= 0
(count (dsl-query "(and (todo done) (not [[page 1]]))"))))
(is (= 2
(count (dsl-query "(and (todo now later) (or [[page 1]] [[page 2]]))"))))
(is (= []
(dsl-query "(and (todo done) (not [[page 1]]))")))
(is (= ["NOW b3 [[page 1]]" "LATER b4 [[page 2]]"]
(map :block/content
(dsl-query "(and (todo now later) (or [[page 1]] [[page 2]]))"))))
(is (= 4
(count (dsl-query "(and (todo now later done) (or [[page 1]] (not [[page 1]])))"))))
(is (= #{"NOW b3 [[page 1]]"
"LATER b4 [[page 2]]"
"DONE b1 [[page 1]]"
"DONE b2 [[page 1]]"}
(set (map :block/content
(dsl-query "(and (todo now later done) (or [[page 1]] (not [[page 1]])))")))))
;; TODO
#_(is (= 34
(count (dsl-query "(not (and (todo now later) (or [[page 1]] [[page 2]])))"))))
(is (= #{"foo:: bar\n" "DONE b1 [[page 1]]" "DONE b2 [[page 1]]"}
(->> (dsl-query "(not (and (todo now later) (or [[page 1]] [[page 2]])))")
(keep :block/content)
set)))
;; FIXME: not working
;; Requires or-join and not-join which aren't supported yet
@@ -385,9 +391,10 @@ tags: other
"OR query")
(is (= ["foo:: bar\n" "b1 [[page 1]] #tag2" "b3"]
(map :block/content
;; ANDed page1 to not clutter results with blocks in default db
(dsl-query "(and (page page1) (not [[page 2]]))")))
(->> (dsl-query "(not [[page 2]])")
;; Only filter to page1 to get meaningful results
(filter #(= "page1" (get-in % [:block/page :block/name])))
(map :block/content)))
"NOT query")))
(defn- load-test-files-with-timestamps