Apply filters before modifying query

woylie · May 27, 2023 · 718c8d4 · 718c8d4
1 parent f914c40
commit 718c8d4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/flop.ex b/lib/flop.ex
@@ -772,8 +772,14 @@ defmodule Flop do
     if count = opts[:count] do
       count
     else
-      q = opts[:count_query] || count_query(q)
-      apply_on_repo(:aggregate, "count", [filter(q, flop, opts), :count], opts)
+      q =
+        if opts[:count_query] do
+          filter(opts[:count_query], flop, opts)
+        else
+          count_query(filter(q, flop, opts))
+        end
+
+      apply_on_repo(:aggregate, "count", [q, :count], opts)
     end
   end