Skip to content

Timeout override now works #448 #779

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
torazar wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −19
Open

Timeout override now works #448 #779

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
24 changes: 5 additions & 19 deletions lib/data_layer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ defmodule AshPostgres.DataLayer do

use Spark.Dsl.Extension,
sections: @sections,
transformers: [AshPostgres.Transformers.AddQueryTimeoutPreparation],

@zachdaniel zachdaniel Jun 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this? I don't think we have this preparation anywhere do we?

verifiers: [
AshPostgres.Verifiers.PreventMultidimensionalArrayAggregates,
AshPostgres.Verifiers.ValidateReferences,
Expand Down Expand Up @@ -833,7 +834,7 @@ defmodule AshPostgres.DataLayer do

@impl true
def set_context(resource, data_layer_query, context) do
AshSql.Query.set_context(resource, data_layer_query, AshPostgres.SqlImplementation, context)
AshPostgres.Sql.Query.set_context(resource, data_layer_query, context)

@zachdaniel zachdaniel Jun 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this module anywhere either 🤔

end

@impl true
Expand Down Expand Up @@ -864,10 +865,7 @@ defmodule AshPostgres.DataLayer do
repo = AshSql.dynamic_repo(resource, AshPostgres.SqlImplementation, query)

with_savepoint(repo, query, fn ->
repo.all(
query,
AshSql.repo_opts(repo, AshPostgres.SqlImplementation, nil, nil, resource)
)
AshPostgres.RepoOpts.all(repo, query, resource)
|> AshSql.Query.remap_mapped_fields(query)
|> then(fn results ->
if query.__ash_bindings__.context[:data_layer][:combination_of_queries?] do
Expand Down Expand Up @@ -1041,16 +1039,7 @@ defmodule AshPostgres.DataLayer do
repo =
AshSql.dynamic_repo(source_resource, AshPostgres.SqlImplementation, query)

repo.one(
query,
AshSql.repo_opts(
repo,
AshPostgres.SqlImplementation,
nil,
nil,
source_resource
)
)
AshPostgres.RepoOpts.one(repo, query, source_resource)
end

{:ok,
Expand Down Expand Up @@ -1101,10 +1090,7 @@ defmodule AshPostgres.DataLayer do
end

results =
repo.all(
lateral_join_query,
AshSql.repo_opts(repo, AshPostgres.SqlImplementation, nil, nil, source_resource)
)
AshPostgres.RepoOpts.all(repo, lateral_join_query, source_resource)
|> AshSql.Query.remap_mapped_fields(
query,
calculations_require_rewrite,
Expand Down
Loading