allow autogenerate to acccept a list of options

Author: dkuku

lib/ecto/repo/schema.ex

@@ -916,15 +916,25 @@ defmodule Ecto.Repo.Schema do
         to_remove = List.wrap(conflict_target)
         replace = replace_all_fields!(:replace_all, schema, to_remove)
 
-        if replace == [], do: raise(ArgumentError, "empty list of fields to update, use the `:replace` option instead")
+        if replace == [],
+          do:
+            raise(
+              ArgumentError,
+              "empty list of fields to update, use the `:replace` option instead"
+            )
 
         {{replace, [], conflict_target}, []}
 
       {:replace_all_except, fields} ->
         to_remove = List.wrap(conflict_target) ++ fields
         replace = replace_all_fields!(:replace_all_except, schema, to_remove)
 
-        if replace == [], do: raise(ArgumentError, "empty list of fields to update, use the `:replace` option instead")
+        if replace == [],
+          do:
+            raise(
+              ArgumentError,
+              "empty list of fields to update, use the `:replace` option instead"
+            )
 
         {{replace, [], conflict_target}, []}
 

lib/ecto/schema.ex

@@ -665,6 +665,7 @@ defmodule Ecto.Schema do
 
     * `:autogenerate` - a `{module, function, args}` tuple for a function
       to call to generate the field value before insertion if value is not set.
+      A list of options is passed as first argument `{type, :autogenerate, [options]}`.
       A shorthand value of `true` is equivalent to `{type, :autogenerate, []}`.
 
     * `:read_after_writes` - When true, the field is always read back
@@ -2044,6 +2045,9 @@ defmodule Ecto.Schema do
         {_, _, _} ->
           store_mfa_autogenerate!(mod, name, type, gen)
 
+        autogenerate_opts when is_list(autogenerate_opts) ->
+          store_mfa_autogenerate!(mod, name, type, {type, :autogenerate, [autogenerate_opts]})
+
         true ->
           store_type_autogenerate!(mod, name, source || name, type, pk?)
 

lib/ecto/type.ex

@@ -320,8 +320,9 @@ defmodule Ecto.Type do
   to `field` with the `:autogenerate` flag.
   """
   @callback autogenerate() :: term()
+  @callback autogenerate(term) :: term()
 
-  @optional_callbacks autogenerate: 0
+  @optional_callbacks autogenerate: 0, autogenerate: 1
 
   ## Functions
 

test/ecto/repo/autogenerate_test.exs

@@ -33,8 +33,8 @@ defmodule Ecto.Repo.AutogenerateTest do
 
     schema "default" do
       field :code, Ecto.UUID, autogenerate: true
-      field :uuid_v4, Ecto.UUID, autogenerate: {Ecto.UUID, :generate, [:v4]}
-      field :uuid_v7, Ecto.UUID, autogenerate: {Ecto.UUID, :generate, [:v7]}
+      field :uuid_v4, Ecto.UUID, autogenerate: [version: 4]
+      field :uuid_v7, Ecto.UUID, autogenerate: [version: 7]
       has_one :manager, Manager
       has_many :offices, Office
       timestamps()