changed
hex_metadata.config
|
@@ -22,4 +22,4 @@
|
22
22
|
{<<"optional">>,false},
|
23
23
|
{<<"repository">>,<<"hexpm">>},
|
24
24
|
{<<"requirement">>,<<"~> 3.3">>}]]}.
|
25
|
- {<<"version">>,<<"2.6.0">>}.
|
25
|
+ {<<"version">>,<<"2.7.0">>}.
|
changed
lib/scrivener/paginater/ecto/query.ex
|
@@ -42,7 +42,7 @@ defimpl Scrivener.Paginater, for: Ecto.Query do
|
42
42
|
query
|
43
43
|
|> offset(^offset)
|
44
44
|
|> limit(^page_size)
|
45
|
- |> repo.all(caller: caller, prefix: prefix)
|
45
|
+ |> all(repo, caller, prefix)
|
46
46
|
end
|
47
47
|
|
48
48
|
defp total_entries(query, repo, caller, options) do
|
|
@@ -53,7 +53,7 @@ defimpl Scrivener.Paginater, for: Ecto.Query do
|
53
53
|
|> exclude(:preload)
|
54
54
|
|> exclude(:order_by)
|
55
55
|
|> aggregate()
|
56
|
- |> repo.one(caller: caller, prefix: prefix)
|
56
|
+ |> one(repo, caller, prefix)
|
57
57
|
|
58
58
|
total_entries || 0
|
59
59
|
end
|
|
@@ -99,4 +99,20 @@ defimpl Scrivener.Paginater, for: Ecto.Query do
|
99
99
|
defp total_pages(total_entries, page_size) do
|
100
100
|
(total_entries / page_size) |> Float.ceil() |> round
|
101
101
|
end
|
102
|
+
|
103
|
+ defp all(query, repo, caller, nil) do
|
104
|
+ repo.all(query, caller: caller)
|
105
|
+ end
|
106
|
+
|
107
|
+ defp all(query, repo, caller, prefix) do
|
108
|
+ repo.all(query, caller: caller, prefix: prefix)
|
109
|
+ end
|
110
|
+
|
111
|
+ defp one(query, repo, caller, nil) do
|
112
|
+ repo.one(query, caller: caller)
|
113
|
+ end
|
114
|
+
|
115
|
+ defp one(query, repo, caller, prefix) do
|
116
|
+ repo.one(query, caller: caller, prefix: prefix)
|
117
|
+ end
|
102
118
|
end
|
changed
mix.exs
|
@@ -4,7 +4,7 @@ defmodule Scrivener.Ecto.Mixfile do
|
4
4
|
def project do
|
5
5
|
[
|
6
6
|
app: :scrivener_ecto,
|
7
|
- version: "2.6.0",
|
7
|
+ version: "2.7.0",
|
8
8
|
elixir: "~> 1.3",
|
9
9
|
elixirc_paths: elixirc_paths(Mix.env()),
|
10
10
|
package: package(),
|
|
@@ -43,7 +43,7 @@ defmodule Scrivener.Ecto.Mixfile do
|
43
43
|
{:ecto_sql, "~> 3.3", only: :test},
|
44
44
|
{:dialyxir, "~> 1.0", only: :dev},
|
45
45
|
{:earmark, ">= 0.0.0", only: :dev},
|
46
|
- {:ex_doc, "~> 0.22.0", only: :dev},
|
46
|
+ {:ex_doc, "~> 0.23", only: :dev},
|
47
47
|
{:postgrex, "~> 0.15.0", only: :test}
|
48
48
|
]
|
49
49
|
end
|