Skip to content
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

Add affected_rows to sql.active_record #1268

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add affected_rows to sql.active_record #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b3c4e5
Add affected_rows to sql.active_record
aidanharan Dec 9, 2024
17d0b78
Update database_statements.rb
aidanharan Dec 10, 2024
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
16 changes: 15 additions & 1 deletion 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 @@ -26,6 +26,10 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
end

verified!

# binding.pry if $DEBUG

notification_payload[:affected_rows] = affected_rows(result)
notification_payload[:row_count] = result.count
result
end
Expand All @@ -39,7 +43,10 @@ def cast_result(raw_result)
end

def affected_rows(raw_result)
raw_result.first['AffectedRows']

# raw_result.first['AffectedRows']

raw_result&.first&.fetch('AffectedRows', 0) || 0
end

def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
Expand Down Expand Up @@ -68,6 +75,11 @@ def exec_update(sql, name = nil, binds = [])
super(sql, name, binds)
end

# def exec_insert_all(sql, name)
# sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
# super(sql, name)
# end

def begin_db_transaction
internal_execute("BEGIN TRANSACTION", "TRANSACTION", allow_retry: true, materialize_transactions: false)
end
Expand Down Expand Up @@ -179,6 +191,8 @@ def execute_procedure(proc_name, *variables)
end

result = result.each.map { |row| row.is_a?(Hash) ? row.with_indifferent_access : row }

notification_payload[:affected_rows] = affected_rows(result)
notification_payload[:row_count] = result.count
result
end
Expand Down
7 changes: 7 additions & 0 deletions test/cases/coerced_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,13 @@ def test_payload_row_count_on_raw_sql_coerced
Book.where(author_id: nil, name: 'row count book 3').delete_all
Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
end

# Fix randomly failing test. The loading of the model's schema was affecting the test.
coerce_tests! :test_payload_affected_rows
def test_payload_affected_rows_coerced
Book.send(:load_schema!)
original_test_payload_affected_rows
end
end
end

Expand Down
Loading