fix: fix expression interpolation for cast_atomic for integer, decimal, float

This commit is contained in:
Zach Daniel 2024-06-14 14:16:01 -04:00
parent c3e02f7b9d
commit 05c51505f2
3 changed files with 16 additions and 16 deletions

View file

@ -83,7 +83,7 @@ defmodule Ash.Type.Decimal do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be less than or equal to %{max}",
vars: %{max: max}
vars: %{max: ^max}
)
else
^expr
@ -96,7 +96,7 @@ defmodule Ash.Type.Decimal do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than or equal to %{min}",
vars: %{min: min}
vars: %{min: ^min}
)
else
^expr
@ -110,8 +110,8 @@ defmodule Ash.Type.Decimal do
else
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than %{min}",
vars: %{min: min}
message: "must be less than %{less_than}",
vars: %{less_than: ^less_than}
)
end
)
@ -123,8 +123,8 @@ defmodule Ash.Type.Decimal do
else
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than %{min}",
vars: %{min: min}
message: "must be greater than %{greater_than}",
vars: %{greater_than: ^greater_than}
)
end
)

View file

@ -122,7 +122,7 @@ defmodule Ash.Type.Float do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be less than or equal to %{max}",
vars: %{max: max}
vars: %{max: ^max}
)
else
^expr
@ -135,7 +135,7 @@ defmodule Ash.Type.Float do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than or equal to %{min}",
vars: %{min: min}
vars: %{min: ^min}
)
else
^expr
@ -149,8 +149,8 @@ defmodule Ash.Type.Float do
else
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than %{min}",
vars: %{min: min}
message: "must be greater than %{less_than}",
vars: %{less_than: ^less_than}
)
end
)
@ -162,8 +162,8 @@ defmodule Ash.Type.Float do
else
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than %{min}",
vars: %{min: min}
message: "must be greater than %{greater_than}",
vars: %{greater_than: ^greater_than}
)
end
)

View file

@ -36,7 +36,7 @@ defmodule Ash.Type.Integer do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be less than or equal to %{max}",
vars: %{max: max}
vars: %{max: ^max}
)
else
^expr
@ -49,7 +49,7 @@ defmodule Ash.Type.Integer do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than or equal to %{min}",
vars: %{min: min}
vars: %{min: ^min}
)
else
^expr
@ -63,14 +63,14 @@ defmodule Ash.Type.Integer do
error(
Ash.Error.Changes.InvalidChanges,
message: "must be greater than or equal to %{min}",
vars: %{min: min}
vars: %{min: ^min}
)
^expr > ^max ->
error(
Ash.Error.Changes.InvalidChanges,
message: "must be less than or equal to %{max}",
vars: %{max: max}
vars: %{max: ^max}
)
true ->