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

Return row-count for pluck #1171

Merged
merged 2 commits into from
May 14, 2024
Merged

Return row-count for pluck #1171

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
bc44d41
Remove index for test
aidanharan May 13, 2024
f3cff55
Fix test_payload_row_count_on_raw_sql_coerced
aidanharan May 13, 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
3 changes: 2 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 @@ -14,14 +14,15 @@ def write_query?(sql) # :nodoc:
end

def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
log(sql, name, async: async) do
log(sql, name, async: async) do |notification_payload|
with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
result = if id_insert_table_name = query_requires_identity_insert?(sql)
with_identity_insert_enabled(id_insert_table_name, conn) { internal_raw_execute(sql, conn, perform_do: true) }
else
internal_raw_execute(sql, conn, perform_do: true)
end
verified!
notification_payload[:row_count] = result
result
end
end
Expand Down
11 changes: 11 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 @@ -363,6 +363,17 @@ def test_payload_row_count_on_select_all_coerced
Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
end

# Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
coerce_tests! :test_payload_row_count_on_pluck
def test_payload_row_count_on_pluck_coerced
connection.remove_index(:books, column: [:author_id, :name])

original_test_payload_row_count_on_pluck
ensure
Book.where(author_id: nil, name: 'row count book 2').delete_all
Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
end

# Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
coerce_tests! :test_payload_row_count_on_raw_sql
def test_payload_row_count_on_raw_sql_coerced
Expand Down
Loading