Skip to content
Snippets Groups Projects
Commit 9f56f825 authored by Cam Saül's avatar Cam Saül
Browse files

Fix native query contents not being used in query-hash

parent 79b5e028
Branches
Tags
No related merge requests found
......@@ -40,7 +40,7 @@
(This is done so irrelevant info or options that don't affect query results doesn't result in the same query producing different hashes.)"
[query]
{:pre [(map? query)]}
(let [{:keys [constraints parameters], :as query} (select-keys query [:database :type :query :parameters :constraints])]
(let [{:keys [constraints parameters], :as query} (select-keys query [:database :type :query :native :parameters :constraints])]
(cond-> query
(empty? constraints) (dissoc :constraints)
(empty? parameters) (dissoc :parameters))))
......
......@@ -94,3 +94,14 @@
(qputil/query-hash {:query :abc})
(qputil/query-hash {:query :abc, :constraints nil})
(qputil/query-hash {:query :abc, :constraints {}})))
;; make sure two different natiev queries have different hashes!
(expect
false
(array=
(qputil/query-hash {:database 2
:type "native"
:native {:query "SELECT pg_sleep(15), 1 AS one"}})
(qputil/query-hash {:database 2
:type "native"
:native {:query "SELECT pg_sleep(15), 2 AS two"}})))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment