Skip to content

accept counter option in to_sql/4 and pass it to prepare_query/4 #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zachdaniel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

accept counter option in to_sql/4 and pass it to prepare_query/4 #726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lib/ecto/adapters/sql.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,16 @@ defmodule Ecto.Adapters.SQL do
"""

@doc @to_sql_doc
@spec to_sql(:all | :update_all | :delete_all, Ecto.Repo.t(), Ecto.Queryable.t()) ::
@spec to_sql(:all | :update_all | :delete_all, Ecto.Repo.t(), Ecto.Queryable.t(), Keyword.t()) ::
{String.t(), query_params}
def to_sql(kind, repo, queryable) do
case Ecto.Adapter.Queryable.prepare_query(kind, repo, queryable) do
def to_sql(kind, repo, queryable, opts \\ []) do
prepare_opts =
case Keyword.fetch(opts, :counter) do
{:ok, counter} -> [counter: counter]
:error -> []
end

case Ecto.Adapter.Queryable.prepare_query(kind, repo, queryable, prepare_opts) do
{{:cached, _update, _reset, {_id, cached}}, params} ->
{String.Chars.to_string(cached), params}

Expand Down Expand Up @@ -825,10 +831,10 @@ defmodule Ecto.Adapters.SQL do
end

@doc unquote(to_sql_doc)
@spec to_sql(:all | :update_all | :delete_all, Ecto.Queryable.t()) ::
@spec to_sql(:all | :update_all | :delete_all, Ecto.Queryable.t(), Keyword.t()) ::
{String.t(), Ecto.Adapters.SQL.query_params()}
def to_sql(operation, queryable) do
Ecto.Adapters.SQL.to_sql(operation, get_dynamic_repo(), queryable)
def to_sql(operation, queryable, opts \\ []) do
Ecto.Adapters.SQL.to_sql(operation, get_dynamic_repo(), queryable, opts)
end

@doc unquote(explain_doc)
Expand Down
Loading