Prevent logging with a level mismatch (#447)

Author: sorentwo

integration_test/sql/logging.exs

@@ -131,6 +131,18 @@ defmodule Ecto.Integration.LoggingTest do
                TestRepo.insert!(%Post{title: "1"}, log: false)
              end) == ""
     end
+
+    test "with a log: true override when logging is disabled" do
+      repo_conf = Application.get_env(:ecto_sql, TestRepo)
+
+      on_exit(fn -> Application.put_env(:ecto_sql, TestRepo, repo_conf) end)
+
+      Application.put_env(:ecto_sql, TestRepo, log: false)
+
+      refute capture_log(fn ->
+               TestRepo.insert!(%Post{title: "1"}, log: true)
+             end) =~ "an exception was raised logging"
+    end
   end
 
   describe "parameter logging" do
@@ -202,7 +214,6 @@ defmodule Ecto.Integration.LoggingTest do
 
       param_logs = Regex.named_captures(param_regex, log)
 
-
       # Autogenerated fields
       assert param_logs["bid1"] =~ @uuid_regex
       assert param_logs["bid2"] =~ @uuid_regex
@@ -243,7 +254,7 @@ defmodule Ecto.Integration.LoggingTest do
       int2 = 2
       uuid2 = Ecto.UUID.generate()
       int_query = from l in Logging, where: l.int == ^int2 and l.uuid == ^uuid2, select: l.int
- 
+
       row2 = [
         int: int_query,
         uuid: uuid2,

lib/ecto/adapters/sql.ex

@@ -1069,20 +1069,23 @@ defmodule Ecto.Adapters.SQL do
       :telemetry.execute(event_name, measurements, metadata)
     end
 
-    case Keyword.get(opts, :log, log) do
-      true ->
+    case {opts[:log], log} do
+      {false, _level} ->
+        :ok
+
+      {true, false} ->
+        :ok
+
+      {true, level} ->
         Logger.log(
-          log,
+          level,
           fn -> log_iodata(measurements, repo, source, query, opts[:cast_params] || params, result, stacktrace) end,
           ansi_color: sql_color(query)
         )
 
-      false ->
-        :ok
-
-      level ->
+      {opts_level, args_level} ->
         Logger.log(
-          level,
+          opts_level || args_level,
           fn -> log_iodata(measurements, repo, source, query, opts[:cast_params] || params, result, stacktrace) end,
           ansi_color: sql_color(query)
         )