Cleanup

Author: Nezteb

lib/ecto/schema.ex

@@ -2326,16 +2326,10 @@ defmodule Ecto.Schema do
 
     struct_fields = Module.get_attribute(module, :ecto_struct_fields) |> Enum.reverse()
     derive = Module.get_attribute(module, :derive)
-    redact = Module.get_attribute(module, :redact)
+    already_derives_inspect? = List.keymember?(derive, Inspect, 0)
 
-    cond do
-      redact == :all_except_primary_keys ->
-        Module.put_attribute(module, :derive, {Inspect, only: primary_key_fields})
-
-      redacted_fields != [] and not List.keymember?(derive, Inspect, 0) and derive_inspect?(module) ->
-        Module.put_attribute(module, :derive, {Inspect, except: redacted_fields})
-
-      true -> :ok
+    if redacted_fields != [] and not already_derives_inspect? and derive_inspect_redacted?(module) do
+      Module.put_attribute(module, :derive, {Inspect, except: redacted_fields})
     end
 
     loaded =
@@ -2412,7 +2406,6 @@ defmodule Ecto.Schema do
       {[:embeds], embed_names},
       {[:updatable_fields], updatable},
       {[:insertable_fields], insertable},
-      {[:redact_schema], redact},
       {[:redact_fields], redacted_fields},
       {[:autogenerate_fields], Enum.flat_map(autogenerate, &elem(&1, 0))},
       {[:virtual_fields], Enum.map(virtual_fields, &elem(&1, 0))},
@@ -2449,7 +2442,7 @@ defmodule Ecto.Schema do
     {struct_fields, bags_of_clauses}
   end
 
-  defp derive_inspect?(module) do
+  defp derive_inspect_redacted?(module) do
     case Module.get_attribute(module, :ecto_derive_inspect_for_redacted_fields) do
       false ->
         IO.warn(