Silence DDL log / notices when migration :log option is false (#478)

Author: deepfryed

integration_test/pg/migrations_test.exs

@@ -44,7 +44,7 @@ defmodule Ecto.Integration.MigrationsTest do
     log =
       capture_log(fn ->
         num = @base_migration + System.unique_integer([:positive])
-        Ecto.Migrator.up(PoolRepo, num, DuplicateTableMigration, log: false)
+        Ecto.Migrator.up(PoolRepo, num, DuplicateTableMigration, log: :info)
       end)
 
     assert log =~ ~s(relation "duplicate_table" already exists, skipping)

lib/ecto/migration/runner.ex

@@ -325,13 +325,16 @@ defmodule Ecto.Migration.Runner do
     meta = Ecto.Adapter.lookup_meta(repo.get_dynamic_repo())
     {:ok, logs} = repo.__adapter__().execute_ddl(meta, command, timeout: :infinity, log: sql)
 
-    Enum.each(logs, fn {level, message, metadata} ->
-      log(level, message, metadata)
+    Enum.each(logs, fn {ddl_log_level, message, metadata} ->
+      ddl_log(ddl_log_level, level, message, metadata)
     end)
 
     :ok
   end
 
+  defp ddl_log(_level, false, _msg, _metadata), do: :ok
+  defp ddl_log(level, _, msg, metadata), do: log(level, msg, metadata)
+
   defp log(level, msg, metadata \\ [])
   defp log(false, _msg, _metadata), do: :ok
   defp log(true, msg, metadata), do: Logger.log(:info, msg, metadata)

lib/ecto/migrator.ex

@@ -203,6 +203,7 @@ defmodule Ecto.Migrator do
 
     * `:log` - the level to use for logging of migration instructions.
       Defaults to `:info`. Can be any of `Logger.level/0` values or a boolean.
+      If `false`, it also avoids logging messages from the database.
     * `:log_migrations_sql` - the level to use for logging of SQL commands
       generated by migrations. Can be any of the `Logger.level/0` values
       or a boolean. If `false`, logging is disabled. If `true`, uses the configured

test/ecto/migrator_test.exs

@@ -240,9 +240,9 @@ defmodule Ecto.MigratorTest do
       lines = String.split(output, "\n")
       assert Enum.at(lines, 1) =~ "== Running #{num} #{inspect(module)}.change/0"
       assert Enum.at(lines, 3) =~ ~s[execute "select 'This is a first part of ecto.#{name}';"]
-      assert Enum.at(lines, 5) =~ "select 'In the middle of ecto.#{name}';"
-      assert Enum.at(lines, 7) =~ ~s[execute "select 'This is a second part of ecto.#{name}';"]
-      assert Enum.at(lines, 9) =~ ~r"Migrated #{num} in \d.\ds"
+      assert Enum.at(lines, 7) =~ "select 'In the middle of ecto.#{name}';"
+      assert Enum.at(lines, 9) =~ ~s[execute "select 'This is a second part of ecto.#{name}';"]
+      assert Enum.at(lines, 13) =~ ~r"Migrated #{num} in \d.\ds"
     end
   end
 
@@ -333,6 +333,30 @@ defmodule Ecto.MigratorTest do
     assert output =~ ~r"== Migrated 12 in \d.\ds"
   end
 
+  test "logs ddl notices" do
+    output = capture_log fn ->
+      :ok = up(TestRepo, 10, ChangeMigration)
+    end
+    assert output =~ "execute ddl"
+
+    output = capture_log fn ->
+      :ok = down(TestRepo, 10, ChangeMigration)
+    end
+    assert output =~ "execute ddl"
+  end
+
+  test "silences ddl notices when log is set to false" do
+    output = capture_log fn ->
+      :ok = up(TestRepo, 10, ChangeMigration, log: false)
+    end
+    refute output =~ "execute ddl"
+
+    output = capture_log fn ->
+      :ok = down(TestRepo, 10, ChangeMigration, log: false)
+    end
+    refute output =~ "execute ddl"
+  end
+
   test "up raises error in strict mode" do
     assert_raise Ecto.MigrationError, fn ->
       up(TestRepo, 0, Migration, log: false, strict_version_order: true)

test/test_repo.exs

@@ -91,7 +91,7 @@ defmodule EctoSQL.TestAdapter do
 
   def execute_ddl(_, command, _) do
     Process.put(:last_command, command)
-    {:ok, []}
+    {:ok, [{:info, "execute ddl", %{command: command}}]}
   end
 
   def supports_ddl_transaction? do