@@ -658,9 +658,15 @@ defmodule Ecto.Adapters.SQL do
658
658
sql_call ( adapter_meta , :query_many , [ sql ] , params , opts )
659
659
end
660
660
661
-
662
661
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
+
664
670
conn = get_conn_or_pool ( pool , adapter_meta )
665
671
opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
666
672
args = args ++ [ params , opts ]
@@ -861,7 +867,9 @@ defmodule Ecto.Adapters.SQL do
861
867
end
862
868
863
869
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 ] } )
865
873
866
874
if log not in @ valid_log_levels do
867
875
raise """
@@ -1100,7 +1108,14 @@ defmodule Ecto.Adapters.SQL do
1100
1108
1101
1109
@ doc false
1102
1110
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
+
1104
1119
opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
1105
1120
1106
1121
case get_conn ( pool ) do
@@ -1116,7 +1131,14 @@ defmodule Ecto.Adapters.SQL do
1116
1131
1117
1132
@ doc false
1118
1133
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
+
1120
1142
opts = with_log ( telemetry , log_stacktrace_mfa , params , opts ++ default_opts )
1121
1143
1122
1144
case get_conn ( pool ) do
@@ -1289,14 +1311,36 @@ defmodule Ecto.Adapters.SQL do
1289
1311
{ true , level } ->
1290
1312
Logger . log (
1291
1313
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 ,
1293
1326
ansi_color: sql_color ( query )
1294
1327
)
1295
1328
1296
1329
{ opts_level , args_level } ->
1297
1330
Logger . log (
1298
1331
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 ,
1300
1344
ansi_color: sql_color ( query )
1301
1345
)
1302
1346
end
@@ -1398,14 +1442,21 @@ defmodule Ecto.Adapters.SQL do
1398
1442
|> Enum . take ( size )
1399
1443
end
1400
1444
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
+
1403
1452
defp last_non_ecto_entries ( [ ] , _ , acc ) , do: acc
1404
1453
1405
1454
## Connection helpers
1406
1455
1407
1456
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
+
1409
1460
opts = with_log ( telemetry , log_stacktrace_mfa , [ ] , opts ++ default_opts )
1410
1461
1411
1462
callback = fn conn ->
0 commit comments