Keep :log_migrator_sql handling in the migrator

Author: josevalim

lib/ecto/adapters/myxql.ex

@@ -231,7 +231,7 @@ defmodule Ecto.Adapters.MyXQL do
       Ecto.Adapters.SQL.raise_migration_pool_size_error()
     end
 
-    opts = Ecto.Adapters.SQL.migrator_log_options(opts) ++ [timeout: :infinity]
+    opts = [log: Keyword.get(opts, :log, false), timeout: :infinity]
 
     {:ok, result} =
       transaction(meta, opts, fn ->

lib/ecto/adapters/postgres.ex

@@ -209,7 +209,7 @@ defmodule Ecto.Adapters.Postgres do
       Ecto.Adapters.SQL.raise_migration_pool_size_error()
     end
 
-    opts = Ecto.Adapters.SQL.migrator_log_options(opts) ++ [timeout: :infinity]
+    opts = [log: Keyword.get(opts, :log, false), timeout: :infinity]
 
     {:ok, result} =
       transaction(meta, opts, fn ->

lib/ecto/adapters/sql.ex

@@ -872,11 +872,6 @@ defmodule Ecto.Adapters.SQL do
 
   ## Log
 
-  @doc false
-  def migrator_log_options(opts) do
-    [log: Keyword.get(opts, :log_migrator_sql, false)]
-  end
-
   defp with_log(telemetry, params, opts) do
     [log: &log(telemetry, params, &1, opts)] ++ opts
   end

lib/ecto/adapters/tds.ex

@@ -284,7 +284,7 @@ defmodule Ecto.Adapters.Tds do
       Ecto.Adapters.SQL.raise_migration_pool_size_error()
     end
 
-    opts = Ecto.Adapters.SQL.migrator_log_options(opts) ++ [timeout: :infinity]
+    opts = [log: Keyword.get(opts, :log, false), timeout: :infinity]
 
     {:ok, result} =
       transaction(meta, opts, fn ->

lib/ecto/migration/schema_migration.ex

@@ -56,6 +56,9 @@ defmodule Ecto.Migration.SchemaMigration do
   end
 
   defp default_opts(opts) do
-    Keyword.merge(@default_opts, [prefix: opts[:prefix]] ++ Ecto.Adapters.SQL.migrator_log_options(opts))
+    Keyword.merge(
+      @default_opts,
+      [prefix: opts[:prefix], log: Keyword.get(opts, :log_migrator_sql, false)]
+    )
   end
 end

lib/ecto/migrator.ex

@@ -334,7 +334,7 @@ defmodule Ecto.Migrator do
       fun.()
     else
       {:ok, result} =
-        repo.transaction(fun, Ecto.Adapters.SQL.migrator_log_options(opts) ++ [timeout: :infinity])
+        repo.transaction(fun, log: migrator_log(opts), timeout: :infinity)
 
       result
     end
@@ -512,7 +512,9 @@ defmodule Ecto.Migrator do
         Keyword.get(opts, :migration_lock, Keyword.get(config, :migration_lock, true))
 
       opts =
-        Keyword.put(opts, :migration_source, config[:migration_source] || "schema_migrations")
+        opts
+        |> Keyword.put(:migration_source, config[:migration_source] || "schema_migrations")
+        |> Keyword.put(:log, migrator_log(opts))
 
       result =
         if lock_or_migration_number && migration_lock? do
@@ -702,8 +704,13 @@ defmodule Ecto.Migrator do
   end
 
   defp log(false, _msg), do: :ok
+  defp log(true, msg), do: Logger.info(msg)
   defp log(level, msg),  do: Logger.log(level, msg)
 
+  defp migrator_log(opts) do
+    Keyword.get(opts, :log_migrator_sql, false)
+  end
+
   defp ensure_repo_started(repo, pool_size) do
     case repo.start_link(pool_size: pool_size) do
       {:ok, _} ->

test/ecto/migrator_test.exs

@@ -273,7 +273,7 @@ defmodule Ecto.MigratorTest do
     assert [{11, :custom} | _] = MigrationsAgent.get()
 
     capture_log(fn ->
-      :already_up = up(TestRepo, 11, ChangeMigration, prefix: :custom)
+      :already_up = up(TestRepo, 11, ChangeMigration, prefix: :custom, log: true)
     end)
 
     assert [{11, :custom} | _] = MigrationsAgent.get()