Skip to content

Commit 21c6068

Browse files
committed
Keep parameterized types as tuples of tuples, closes #4419
1 parent 5f3c1f5 commit 21c6068

File tree

13 files changed

+3017
-1258
lines changed

13 files changed

+3017
-1258
lines changed

lib/ecto/enum.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ defmodule Ecto.Enum do
314314

315315
def mappings(types, field) when is_map(types) do
316316
case types do
317-
%{^field => {:parameterized, Ecto.Enum, %{mappings: mappings}}} -> mappings
318-
%{^field => {_, {:parameterized, Ecto.Enum, %{mappings: mappings}}}} -> mappings
317+
%{^field => {:parameterized, {Ecto.Enum, %{mappings: mappings}}}} -> mappings
318+
%{^field => {_, {:parameterized, {Ecto.Enum, %{mappings: mappings}}}}} -> mappings
319319
%{^field => _} -> raise ArgumentError, "#{field} is not an Ecto.Enum field"
320320
%{} -> raise ArgumentError, "#{field} does not exist"
321321
end

lib/ecto/parameterized_type.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ defmodule Ecto.ParameterizedType do
193193
Useful when manually initializing a type for schemaless changesets.
194194
"""
195195
def init(type, opts) do
196-
{:parameterized, type, type.init(opts)}
196+
{:parameterized, {type, type.init(opts)}}
197197
end
198198

199199
@doc false

0 commit comments

Comments
 (0)