Skip to content

Commit 1495a22

Browse files
Fixed query logging so that filter parameters are respected (#1372)
Co-authored-by: Matt Taylor <70293171+mtaylor-vailsys@users.noreply.github.com>
1 parent 8a585f1 commit 1495a22

File tree

6 files changed

+66
-197
lines changed

6 files changed

+66
-197
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ def write_query?(sql) # :nodoc:
1414
end
1515

1616
def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
17+
unless binds.nil? || binds.empty?
18+
types, params = sp_executesql_types_and_parameters(binds)
19+
sql = sp_executesql_sql(sql, types, params, notification_payload[:name])
20+
end
21+
1722
id_insert_table_name = query_requires_identity_insert?(sql)
1823

1924
result, affected_rows = if id_insert_table_name
@@ -48,15 +53,6 @@ def affected_rows_from_results_or_handle(raw_result, handle)
4853
affected_rows(raw_result) || handle.affected_rows
4954
end
5055

51-
def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
52-
unless binds.nil? || binds.empty?
53-
types, params = sp_executesql_types_and_parameters(binds)
54-
sql = sp_executesql_sql(sql, types, params, name)
55-
end
56-
57-
super
58-
end
59-
6056
def internal_exec_sql_query(sql, conn)
6157
handle = internal_raw_execute(sql, conn)
6258
results = handle_to_names_and_values(handle, ar_result: true)

0 commit comments

Comments
 (0)