Keep parameterized types as tuples of tuples, closes #4419

elixir-ecto · May 26, 2024 · 21c6068 · 21c6068
1 parent 5f3c1f5
commit 21c6068
Show file tree

Hide file tree

Showing 13 changed files with 3,017 additions and 1,258 deletions.
diff --git a/lib/ecto/enum.ex b/lib/ecto/enum.ex
@@ -314,8 +314,8 @@ defmodule Ecto.Enum do
 
   def mappings(types, field) when is_map(types) do
     case types do
-      %{^field => {:parameterized, Ecto.Enum, %{mappings: mappings}}} -> mappings
-      %{^field => {_, {:parameterized, Ecto.Enum, %{mappings: mappings}}}} -> mappings
+      %{^field => {:parameterized, {Ecto.Enum, %{mappings: mappings}}}} -> mappings
+      %{^field => {_, {:parameterized, {Ecto.Enum, %{mappings: mappings}}}}} -> mappings
       %{^field => _} -> raise ArgumentError, "#{field} is not an Ecto.Enum field"
       %{} -> raise ArgumentError, "#{field} does not exist"
     end

diff --git a/lib/ecto/parameterized_type.ex b/lib/ecto/parameterized_type.ex
@@ -193,7 +193,7 @@ defmodule Ecto.ParameterizedType do
   Useful when manually initializing a type for schemaless changesets.
   """
   def init(type, opts) do
-    {:parameterized, type, type.init(opts)}
+    {:parameterized, {type, type.init(opts)}}
   end
 
   @doc false