@@ -658,9 +658,15 @@ defmodule Ecto.Adapters.SQL do
658658 sql_call ( adapter_meta , :query_many , [ sql ] , params , opts )
659659 end
660660
661-
662661 defp sql_call ( adapter_meta , callback , args , params , opts ) do
663- % { pid: pool , telemetry: telemetry , sql: sql , opts: default_opts , log_stacktrace_mfa: log_stacktrace_mfa } = adapter_meta
662+ % {
663+ pid: pool ,
664+ telemetry: telemetry ,
665+ sql: sql ,
666+ opts: default_opts ,
667+ log_stacktrace_mfa: log_stacktrace_mfa
668+ } = adapter_meta
669+
664670 conn = get_conn_or_pool ( pool , adapter_meta )
665671 opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
666672 args = args ++ [ params , opts ]
@@ -861,7 +867,9 @@ defmodule Ecto.Adapters.SQL do
861867 end
862868
863869 log = Keyword . get ( config , :log , :debug )
864- log_stacktrace_mfa = Keyword . get ( config , :log_stacktrace_mfa , { __MODULE__ , :last_non_ecto_stacktrace , [ 1 ] } )
870+
871+ log_stacktrace_mfa =
872+ Keyword . get ( config , :log_stacktrace_mfa , { __MODULE__ , :last_non_ecto_stacktrace , [ 1 ] } )
865873
866874 if log not in @ valid_log_levels do
867875 raise """
@@ -1100,7 +1108,14 @@ defmodule Ecto.Adapters.SQL do
11001108
11011109 @ doc false
11021110 def reduce ( adapter_meta , statement , params , opts , acc , fun ) do
1103- % { pid: pool , telemetry: telemetry , sql: sql , log_stacktrace_mfa: log_stacktrace_mfa , opts: default_opts } = adapter_meta
1111+ % {
1112+ pid: pool ,
1113+ telemetry: telemetry ,
1114+ sql: sql ,
1115+ log_stacktrace_mfa: log_stacktrace_mfa ,
1116+ opts: default_opts
1117+ } = adapter_meta
1118+
11041119 opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
11051120
11061121 case get_conn ( pool ) do
@@ -1116,7 +1131,14 @@ defmodule Ecto.Adapters.SQL do
11161131
11171132 @ doc false
11181133 def into ( adapter_meta , statement , params , opts ) do
1119- % { pid: pool , telemetry: telemetry , sql: sql , opts: default_opts , log_stacktrace_mfa: log_stacktrace_mfa } = adapter_meta
1134+ % {
1135+ pid: pool ,
1136+ telemetry: telemetry ,
1137+ sql: sql ,
1138+ opts: default_opts ,
1139+ log_stacktrace_mfa: log_stacktrace_mfa
1140+ } = adapter_meta
1141+
11201142 opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
11211143
11221144 case get_conn ( pool ) do
@@ -1289,14 +1311,36 @@ defmodule Ecto.Adapters.SQL do
12891311 { true , level } ->
12901312 Logger . log (
12911313 level ,
1292- fn -> log_iodata ( measurements , repo , source , query , log_params , result , stacktrace , stacktrace_mfa ( log_stacktrace_mfa , opts ) ) end ,
1314+ fn ->
1315+ log_iodata (
1316+ measurements ,
1317+ repo ,
1318+ source ,
1319+ query ,
1320+ log_params ,
1321+ result ,
1322+ stacktrace ,
1323+ stacktrace_mfa ( log_stacktrace_mfa , opts )
1324+ )
1325+ end ,
12931326 ansi_color: sql_color ( query )
12941327 )
12951328
12961329 { opts_level , args_level } ->
12971330 Logger . log (
12981331 opts_level || args_level ,
1299- fn -> log_iodata ( measurements , repo , source , query , log_params , result , stacktrace , stacktrace_mfa ( log_stacktrace_mfa , opts ) ) end ,
1332+ fn ->
1333+ log_iodata (
1334+ measurements ,
1335+ repo ,
1336+ source ,
1337+ query ,
1338+ log_params ,
1339+ result ,
1340+ stacktrace ,
1341+ stacktrace_mfa ( log_stacktrace_mfa , opts )
1342+ )
1343+ end ,
13001344 ansi_color: sql_color ( query )
13011345 )
13021346 end
@@ -1398,14 +1442,21 @@ defmodule Ecto.Adapters.SQL do
13981442 |> Enum . take ( size )
13991443 end
14001444
1401- defp last_non_ecto_entries ( [ { mod , _ , _ , _ } | _ ] , repo , acc ) when mod == repo or mod in @ repo_modules , do: acc
1402- defp last_non_ecto_entries ( [ entry | rest ] , repo , acc ) , do: last_non_ecto_entries ( rest , repo , [ entry | acc ] )
1445+ defp last_non_ecto_entries ( [ { mod , _ , _ , _ } | _ ] , repo , acc )
1446+ when mod == repo or mod in @ repo_modules ,
1447+ do: acc
1448+
1449+ defp last_non_ecto_entries ( [ entry | rest ] , repo , acc ) ,
1450+ do: last_non_ecto_entries ( rest , repo , [ entry | acc ] )
1451+
14031452 defp last_non_ecto_entries ( [ ] , _ , acc ) , do: acc
14041453
14051454 ## Connection helpers
14061455
14071456 defp checkout_or_transaction ( fun , adapter_meta , opts , callback ) do
1408- % { pid: pool , telemetry: telemetry , opts: default_opts , log_stacktrace_mfa: log_stacktrace_mfa } = adapter_meta
1457+ % { pid: pool , telemetry: telemetry , opts: default_opts , log_stacktrace_mfa: log_stacktrace_mfa } =
1458+ adapter_meta
1459+
14091460 opts = with_log ( telemetry , log_stacktrace_mfa , [ ] , opts ++ default_opts )
14101461
14111462 callback = fn conn ->
0 commit comments