From 8c64502e2253831b44e1ced2f4076a0997aa84e4 Mon Sep 17 00:00:00 2001 From: Drew Olson Date: Mon, 23 Nov 2020 15:38:31 +0000 Subject: [PATCH] Don't pass prefix when nil --- lib/scrivener/paginater/ecto/query.ex | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/scrivener/paginater/ecto/query.ex b/lib/scrivener/paginater/ecto/query.ex index f648e46..7692d85 100644 --- a/lib/scrivener/paginater/ecto/query.ex +++ b/lib/scrivener/paginater/ecto/query.ex @@ -42,7 +42,7 @@ defimpl Scrivener.Paginater, for: Ecto.Query do query |> offset(^offset) |> limit(^page_size) - |> repo.all(caller: caller, prefix: prefix) + |> all(repo, caller, prefix) end defp total_entries(query, repo, caller, options) do @@ -53,7 +53,7 @@ defimpl Scrivener.Paginater, for: Ecto.Query do |> exclude(:preload) |> exclude(:order_by) |> aggregate() - |> repo.one(caller: caller, prefix: prefix) + |> one(repo, caller, prefix) total_entries || 0 end @@ -99,4 +99,20 @@ defimpl Scrivener.Paginater, for: Ecto.Query do defp total_pages(total_entries, page_size) do (total_entries / page_size) |> Float.ceil() |> round end + + defp all(query, repo, caller, nil) do + repo.all(query, caller: caller) + end + + defp all(query, repo, caller, prefix) do + repo.all(query, caller: caller, prefix: prefix) + end + + defp one(query, repo, caller, nil) do + repo.one(query, caller: caller) + end + + defp one(query, repo, caller, prefix) do + repo.one(query, caller: caller, prefix: prefix) + end end