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

Remove parse catch for consistent error handling

Browse Source 
For advanced queries we error when invalid queries are written. We
should do the same for simple query.
Also add a test for tag query format
This commit is contained in:
Gabriel Horner
2022-03-15 16:09:12 -04:00
committed by Tienson Qin
parent e615423e6a
commit a41dd0abfc
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,35 +494,30 @@ Some bindings in this fn:
[s]
(when (and (string? s)
(not (string/blank? s)))
(try
(let [s (if (= \# (first s)) (util/format "[[%s]]" (subs s 1)) s)
form (some-> s
(pre-transform)
(reader/read-string))
sort-by (atom nil)
blocks? (atom nil)
sample (atom nil)
{result :query rules :rules}
(when form (build-query form {:sort-by sort-by
:blocks? blocks?
:sample sample}))
result' (when (seq result)
(let [key (if (coll? (first result))
(keyword (ffirst result))
(keyword (first result)))
result (case key
:and
(rest result)
result)]
(add-bindings! form result)))]
{:query result'
:rules (mapv rules/query-dsl-rules rules)
:sort-by @sort-by
:blocks? (boolean @blocks?)
:sample sample})
(catch js/Error e
(log/error :query-dsl/parse-error e)))))
(let [s (if (= \# (first s)) (util/format "[[%s]]" (subs s 1)) s)
form (some-> s
(pre-transform)
(reader/read-string))
sort-by (atom nil)
blocks? (atom nil)
sample (atom nil)
{result :query rules :rules}
(when form (build-query form {:sort-by sort-by
:blocks? blocks?
:sample sample}))
result' (when (seq result)
(let [key (if (coll? (first result))
;; Only queries for this branch are not's like:
;; [(not (page-ref ?b "page 2"))]
(keyword (ffirst result))
(keyword (first result)))]
(add-bindings! form
(if (= key :and) (rest result) result))))]
{:query result'
:rules (mapv rules/query-dsl-rules rules)
:sort-by @sort-by
:blocks? (boolean @blocks?)
:sample sample})))
;; Main fns
;; ========