Update for Ecto 3.12.0 change (#57)

* Fix for tuples in tuples, with Ecto 3.12.0 Enums

* Fix Enum value order ambiguity, by sorting them

Author: michielfbr

lib/ecto/erd/document/dbml.ex

@@ -89,7 +89,8 @@ defmodule Ecto.ERD.Document.DBML do
       fields
       |> Enum.flat_map(fn
         %Field{name: name, type: {:parameterized, Ecto.Enum, %{on_dump: on_dump}}} ->
-          [{source, name, Map.values(on_dump)}]
+          values = on_dump |> Map.values() |> Enum.sort()
+          [{source, name, values}]
 
         _ ->
           []

lib/ecto/erd/document/dot.ex

@@ -144,7 +144,7 @@ defmodule Ecto.ERD.Document.Dot do
   defp format_field(%Field{name: name}, :name), do: inspect(name)
   defp format_field(%Field{type: type}, :type), do: format_type(type)
 
-  defp format_type({:parameterized, Ecto.Enum, %{on_dump: on_dump}}) do
+  defp format_type({:parameterized, {Ecto.Enum, %{on_dump: on_dump}}}) do
     "#Enum<#{inspect(Enum.sort(Map.keys(on_dump)), limit: 10)}>"
   end
 

lib/ecto/erd/document/plantuml.ex

@@ -124,7 +124,7 @@ defmodule Ecto.ERD.Document.PlantUML do
     |> Enum.join(" ")
   end
 
-  defp format_type({:parameterized, Ecto.Enum, %{on_dump: on_dump}}) do
+  defp format_type({:parameterized, {Ecto.Enum, %{on_dump: on_dump}}}) do
     elements_limit = 10
     values = Map.values(on_dump)
     length = length(values)

lib/ecto/erd/document/quick_dbd.ex

@@ -60,7 +60,7 @@ defmodule Ecto.ERD.Document.QuickDBD do
     )
   end
 
-  defp format_type({:parameterized, Ecto.Enum, %{on_dump: on_dump}}) do
+  defp format_type({:parameterized, {Ecto.Enum, %{on_dump: on_dump}}}) do
     "enum(#{Enum.join(Map.values(on_dump), ",")})"
   end
 

mix.exs

@@ -75,7 +75,7 @@ defmodule Ecto.ERD.MixProject do
     [
       {:ex_doc, "~> 0.24", only: :dev, runtime: false},
       {:html_entities, "~> 0.5"},
-      {:ecto, "~> 3.10"},
+      {:ecto, "~> 3.12"},
       {:dialyxir, "~> 1.0", only: [:dev], runtime: false}
     ]
   end

mix.lock

@@ -2,7 +2,7 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
-  "ecto": {:hex, :ecto, "3.11.2", "e1d26be989db350a633667c5cda9c3d115ae779b66da567c68c80cfb26a8c9ee", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3c38bca2c6f8d8023f2145326cc8a80100c3ffe4dcbd9842ff867f7fc6156c65"},
+  "ecto": {:hex, :ecto, "3.12.1", "626765f7066589de6fa09e0876a253ff60c3d00870dd3a1cd696e2ba67bfceea", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "df0045ab9d87be947228e05a8d153f3e06e0d05ab10c3b3cc557d2f7243d1940"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_doc": {:hex, :ex_doc, "0.32.1", "21e40f939515373bcdc9cffe65f3b3543f05015ac6c3d01d991874129d173420", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5142c9db521f106d61ff33250f779807ed2a88620e472ac95dc7d59c380113da"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},