Skip to content

Commit 99d9588

Browse files
committed
Propagate opts configured in prepare_query/3 to preloads
This ensures that when `:on_preloader_spawn` is set in the `prepare_query/3` callback, it is propagated to the preloader.
1 parent b75b860 commit 99d9588

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

lib/ecto/repo/queryable.ex

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ defmodule Ecto.Repo.Queryable do
213213

214214
## Helpers
215215

216-
defp execute(operation, name, query, {adapter_meta, opts} = tuplet) do
216+
defp execute(operation, name, query, {adapter_meta, opts} = _tuplet) do
217217
%{adapter: adapter, cache: cache, repo: repo} = adapter_meta
218218

219219
{query, opts} = repo.prepare_query(operation, query, opts)
@@ -244,7 +244,14 @@ defmodule Ecto.Repo.Queryable do
244244
{count,
245245
rows
246246
|> Ecto.Repo.Assoc.query(assocs, sources, preprocessor)
247-
|> Ecto.Repo.Preloader.query(name, preloads, take, assocs, postprocessor, tuplet)}
247+
|> Ecto.Repo.Preloader.query(
248+
name,
249+
preloads,
250+
take,
251+
assocs,
252+
postprocessor,
253+
{adapter_meta, opts}
254+
)}
248255
end
249256
end
250257

0 commit comments

Comments
 (0)