Merge types during Ecto.Changeset.merge/2
#4426
Merged
Conversation
This file contains 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
This commit adds support for merging types when calling `Ecto.Changeset.merge/2`. Closes elixir-ecto#4424
vinibrsl
commented
Jun 1, 2024
lib/ecto/changeset.ex
Outdated
| @@ -1523,10 +1523,10 @@ defmodule Ecto.Changeset do | |||
|
|
|||
| defp cast_merge(cs1, cs2) do | |||
| new_params = (cs1.params || cs2.params) && Map.merge(cs1.params || %{}, cs2.params || %{}) | |||
| new_types = (cs1.types || cs2.types) && Map.merge(cs1.types || %{}, cs2.types || %{}) | |||
There was a problem hiding this comment.
From the Ecto.Changeset.t/1 typespec, types can be nil, so I implemented fallbacks with ||. However, in the context of Ecto.Changeset.merge/2, I'm not sure if types can actually be nil, since an (ArgumentError) different :data when merging changesets error is raised if the data fields differ.
Could someone please confirm if it's safe to simply Map.merge(cs1.types, cs2.types) for a cleaner solution?
vinibrsl
changed the title
Ecto.Changeset.merge/2
josevalim
reviewed
Jun 1, 2024
josevalim
reviewed
Jun 1, 2024
| @@ -1523,10 +1523,10 @@ defmodule Ecto.Changeset do | |||
|
|
|||
| defp cast_merge(cs1, cs2) do | |||
| new_params = (cs1.params || cs2.params) && Map.merge(cs1.params || %{}, cs2.params || %{}) | |||
| new_types = Map.merge(cs1.types, cs2.types) | |||
There was a problem hiding this comment.
It seems the assumption is that some people were initializing the changeset directly without the proper API. I don't think we need to support that.
|
💚 💙 💜 💛 ❤️ |
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.
This commit adds support for merging types when calling
Ecto.Changeset.merge/2.Closes #4424