Share loading/dumping logic between embed and typed maps, closes #2637

integration_test/cases/type.exs

@@ -193,7 +193,7 @@ defmodule Ecto.Integration.TypeTest do
   end
 
   @tag :map_type
-  test "typed map" do
+  test "typed string map" do
     post1 = TestRepo.insert!(%Post{links: %{"foo" => "http://foo.com", "bar" => "http://bar.com"}})
     post2 = TestRepo.insert!(%Post{links: %{foo: "http://foo.com", bar: "http://bar.com"}})
 
@@ -203,6 +203,14 @@ defmodule Ecto.Integration.TypeTest do
            [%{"foo" => "http://foo.com", "bar" => "http://bar.com"}]
   end
 
+  @tag :map_type
+  test "typed float map" do
+    post = TestRepo.insert!(%Post{intensities: %{"foo" => 1.0, "bar" => 416500.0}})
+
+    assert TestRepo.all(from p in Post, where: p.id == ^post.id, select: p.intensities) ==
+           [%{"foo" => 1.0, "bar" => 416500}]
+  end
+
   @tag :map_type
   test "map type on update" do
     post = TestRepo.insert!(%Post{meta: %{"world" => "hello"}})

integration_test/support/migration.exs

@@ -16,6 +16,7 @@ defmodule Ecto.Integration.Migration do
       add :uuid, :uuid
       add :meta, :map
       add :links, {:map, :string}
+      add :intensities, {:map, :float}
       add :public, :boolean
       add :cost, :decimal, precision: 2, scale: 1
       add :visits, :integer

integration_test/support/schemas.exs

@@ -38,6 +38,7 @@ defmodule Ecto.Integration.Post do
     field :uuid, Ecto.UUID, autogenerate: true
     field :meta, :map
     field :links, {:map, :string}
+    field :intensities, {:map, :float}
     field :posted, :date
     has_many :comments, Ecto.Integration.Comment, on_delete: :delete_all, on_replace: :delete
     has_one :permalink, Ecto.Integration.Permalink, on_delete: :delete_all, on_replace: :delete

lib/ecto/adapters/postgres.ex

@@ -118,6 +118,7 @@ defmodule Ecto.Adapters.Postgres do
   # Support arrays in place of IN
   @doc false
   def dumpers({:embed, _} = type, _),  do: [&Ecto.Adapters.SQL.dump_embed(type, &1)]
+  def dumpers({:map, _} = type, _),    do: [&Ecto.Adapters.SQL.dump_embed(type, &1)]
   def dumpers({:in, sub}, {:in, sub}), do: [{:array, sub}]
   def dumpers(:binary_id, type),       do: [type, Ecto.UUID]
   def dumpers(_, type),                do: [type]

lib/ecto/adapters/sql.ex

@@ -45,11 +45,13 @@ defmodule Ecto.Adapters.SQL do
 
       @doc false
       def loaders({:embed, _} = type, _), do: [&Ecto.Adapters.SQL.load_embed(type, &1)]
+      def loaders({:map, _} = type, _),   do: [&Ecto.Adapters.SQL.load_embed(type, &1)]
       def loaders(:binary_id, type),      do: [Ecto.UUID, type]
       def loaders(_, type),               do: [type]
 
       @doc false
       def dumpers({:embed, _} = type, _), do: [&Ecto.Adapters.SQL.dump_embed(type, &1)]
+      def dumpers({:map, _} = type, _),   do: [&Ecto.Adapters.SQL.dump_embed(type, &1)]
       def dumpers(:binary_id, type),      do: [type, Ecto.UUID]
       def dumpers(_, type),               do: [type]