undo

greg-rychlewski · greg-rychlewski · commit fbac40f01047 · 2024-12-23T17:35:20.000-05:00
diff --git a/lib/ecto/query/planner.ex b/lib/ecto/query/planner.ex
@@ -2563,11 +2563,7 @@ defmodule Ecto.Query.Planner do
   defp field_source({source, schema, _}, field) when is_binary(source) and schema != nil do
     # If the field is not found we return the field itself
     # which will be checked and raise later.
-
-    case schema.__schema__(:field_source, field) do
-      nil -> if is_binary(field), do: String.to_existing_atom(field), else: field
-      field_source -> field_source
-    end
+    schema.__schema__(:field_source, field) || field
   end
 
   defp field_source(_, field) do
diff --git a/lib/ecto/schema.ex b/lib/ecto/schema.ex
@@ -598,16 +598,11 @@ defmodule Ecto.Schema do
           end
         end
 
-        for clauses <-
-              Ecto.Schema.__schema__(fields, field_sources, assocs, embeds, virtual_fields, read_only),
-            clause <- clauses do
-          case clause do
-            {args, body} ->
-              def __schema__(unquote_splicing(args)), do: unquote(body)
-
-            {args, when_expr, body} ->
-              def __schema__(unquote_splicing(args)) when(unquote(when_expr)), do: unquote(body)
-          end
+        def __schema__(:source), do: unquote(source)
+        def __schema__(:prefix), do: unquote(Macro.escape(prefix))
+
+        for clauses <- bags_of_clauses, {args, body} <- clauses do
+          def __schema__(unquote_splicing(args)), do: unquote(body)
         end
 
         :ok
