Compile on_writable_violation map into multiple clauses

Author: josevalim

lib/ecto/repo/schema.ex

@@ -638,7 +638,7 @@ defmodule Ecto.Repo.Schema do
   end
 
   defp handle_writable_violation(field, schema, action) do
-    on_writable_violation = schema.__schema__(:on_writable_violation)[field]
+    on_writable_violation = schema.__schema__(:on_writable_violation, field)
 
     message = "attempted to write to non-writable field #{inspect(field)} during #{action}"
 

lib/ecto/schema.ex

@@ -2028,9 +2028,7 @@ defmodule Ecto.Schema do
     writable = opts[:writable] || :always
     put_struct_field(mod, name, Keyword.get(opts, :default))
 
-    on_writable_violation = Keyword.get_lazy(opts, :on_writable_violation, fn ->
-      Module.get_attribute(mod, :on_writable_violation, :nothing)
-    end)
+    on_writable_violation = Keyword.get(opts, :on_writable_violation)
 
     redact_field? =
       Keyword.get_lazy(opts, :redact, fn ->
@@ -2086,7 +2084,9 @@ defmodule Ecto.Schema do
         raise ArgumentError, "autogenerated fields must always be writable"
       end
 
-      Module.put_attribute(mod, :ecto_on_writable_violation, {name, on_writable_violation})
+      if on_writable_violation do
+        Module.put_attribute(mod, :ecto_on_writable_violation, {name, on_writable_violation})
+      end
 
       if pk? do
         Module.put_attribute(mod, :ecto_primary_keys, name)
@@ -2387,6 +2387,7 @@ defmodule Ecto.Schema do
     read_after_writes = Module.get_attribute(module, :ecto_raw) |> Enum.reverse()
     autogenerate_id = Module.get_attribute(module, :ecto_autogenerate_id)
     on_writable_violation = Module.get_attribute(module, :ecto_on_writable_violation)
+    on_writable_violation_default = Module.get_attribute(module, :on_writable_violation, :nothing)
 
     struct_fields = Module.get_attribute(module, :ecto_struct_fields) |> Enum.reverse()
     derive = Module.get_attribute(module, :derive)
@@ -2470,7 +2471,6 @@ defmodule Ecto.Schema do
       {[:embeds], embed_names},
       {[:updatable_fields], updatable},
       {[:insertable_fields], insertable},
-      {[:on_writable_violation], on_writable_violation |> Map.new() |> Macro.escape()},
       {[:redact_fields], redacted_fields},
       {[:autogenerate_fields], Enum.flat_map(autogenerate, &elem(&1, 0))},
       {[:virtual_fields], Enum.map(virtual_fields, &elem(&1, 0))},
@@ -2490,12 +2490,19 @@ defmodule Ecto.Schema do
       {[:type, quote(do: _)], nil},
       {[:virtual_type, quote(do: _)], nil},
       {[:association, quote(do: _)], nil},
-      {[:embed, quote(do: _)], nil}
+      {[:embed, quote(do: _)], nil},
+      {[:on_writable_violation, quote(do: _)], on_writable_violation_default}
     ]
 
+    on_writable_violation_quoted =
+      for {name, value} <- on_writable_violation do
+        {[:on_writable_violation, name], value}
+      end
+
     bags_of_clauses =
       [
         single_arg,
+        on_writable_violation_quoted,
         field_sources_quoted,
         types_quoted,
         virtual_types_quoted,

test/ecto/schema_test.exs

@@ -542,11 +542,21 @@ defmodule Ecto.SchemaTest do
   end
 
   test "schema with @on_writable_violation defaults :on_writable_violation" do
-    %{a: :raise, b: :raise, c: :nothing, d: :warn} = SchemaWithOnWritableViolation.__schema__(:on_writable_violation)
+    assert SchemaWithOnWritableViolation.__schema__(:on_writable_violation, :a) == :raise
+    assert SchemaWithOnWritableViolation.__schema__(:on_writable_violation, :b) == :raise
+    assert SchemaWithOnWritableViolation.__schema__(:on_writable_violation, :c) == :nothing
+    assert SchemaWithOnWritableViolation.__schema__(:on_writable_violation, :d) == :warn
+    assert SchemaWithOnWritableViolation.__schema__(:on_writable_violation, :unknown) == :raise
   end
 
   test "schema without @on_writable_violation uses the field-level default (:nothing)" do
-    %{a: :nothing, b: :nothing, c: :warn, d: :raise} = SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation)
+    assert SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation, :a) == :nothing
+    assert SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation, :b) == :nothing
+    assert SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation, :c) == :warn
+    assert SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation, :d) == :raise
+
+    assert SchemaWithoutOnWritableViolation.__schema__(:on_writable_violation, :unknown) ==
+             :nothing
   end
 
   ## Errors