refactor: move immutable error expressions from AshSql into AshPostgres #633
+181
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stevebrambilla
commented
Oct 8, 2025
Comment on lines
+89
to
+131
| if Ash.Expr.expr?(input) do | ||
| frag_parts = | ||
| Enum.flat_map(input, fn {key, value} -> | ||
| if Ash.Expr.expr?(value) do | ||
| [ | ||
| expr: to_string(key), | ||
| raw: "::text, ", | ||
| expr: value, | ||
| raw: ", " | ||
| ] | ||
| else | ||
| [ | ||
| expr: to_string(key), | ||
| raw: "::text, ", | ||
| expr: value, | ||
| raw: "::jsonb, " | ||
| ] | ||
| end | ||
| end) | ||
|
|
||
| frag_parts = | ||
| List.update_at(frag_parts, -1, fn {:raw, text} -> | ||
| {:raw, String.trim_trailing(text, ", ") <> "))"} | ||
| end) | ||
|
|
||
| AshSql.Expr.dynamic_expr( | ||
| query, | ||
| %Ash.Query.Function.Fragment{ | ||
| embedded?: false, | ||
| arguments: | ||
| [ | ||
| raw: "jsonb_build_object('exception', ", | ||
| expr: inspect(exception), | ||
| raw: "::text, 'input', jsonb_build_object(" | ||
| ] ++ | ||
| frag_parts | ||
| }, | ||
| bindings, | ||
| embedded?, | ||
| nil, | ||
| acc | ||
| ) | ||
| else |
There was a problem hiding this comment.
This bit has a bit of duplication with AshSql for now, but some of this will be reworked soon specifically for immutable raise errors so it's good that it's separate
| end | ||
|
|
||
| # Returns a row-dependent token to prevent constant-folding for immutable functions. | ||
| defp immutable_error_expr_token(query, bindings) do |
There was a problem hiding this comment.
This is moved from AshSql, will revert the code I added there last week
| [ | ||
| {:ash, ash_version("~> 3.5 and >= 3.5.35")}, | ||
| {:spark, "~> 2.3 and >= 2.3.4"}, | ||
| # TODO: bump to next ash_sql release |
There was a problem hiding this comment.
I added this in the previous PR, and since the immutable error expressions are self-contained within AshPostgres now, there's no hard requirement to bump the AshSql version for this
Though you may still want to for that other typing bugfix
7 tasks
|
🚀 Thank you for your contribution! 🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of splitting the code across AshPostgres and AshSql for this, I realized that we can keep it entirely self-contained in AshPostgres using AshSql's
exprcallback.Contributor checklist
Leave anything that you believe does not apply unchecked.