Skip to content

Fixed query logging so that filter parameters are respected #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+66 −197
Open

Fixed query logging so that filter parameters are respected #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7b1adb
Fixed query logging so that filter parameters are respected
aidanharan Nov 6, 2025
785f2ba
Standardrb
aidanharan Nov 6, 2025
e7d36c7
Update coerced_tests.rb
aidanharan Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/active_record/connection_adapters/sqlserver/database_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ def write_query?(sql) # :nodoc:
end

def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
unless binds.nil? || binds.empty?
types, params = sp_executesql_types_and_parameters(binds)
sql = sp_executesql_sql(sql, types, params, notification_payload[:name])
end

id_insert_table_name = query_requires_identity_insert?(sql)

result, affected_rows = if id_insert_table_name
Expand Down Expand Up @@ -48,15 +53,6 @@ def affected_rows_from_results_or_handle(raw_result, handle)
affected_rows(raw_result) || handle.affected_rows
end

def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
unless binds.nil? || binds.empty?
types, params = sp_executesql_types_and_parameters(binds)
sql = sp_executesql_sql(sql, types, params, name)
end

super
end

def internal_exec_sql_query(sql, conn)
handle = internal_raw_execute(sql, conn)
results = handle_to_names_and_values(handle, ar_result: true)
Expand Down
Loading