Visitar URL original
[6.1] Propagate Errors from ExecuteScalar by samsharma2700 · Pull Request #3947 · dotnet/SqlClient · GitHub
Skip to content

[6.1] Propagate Errors from ExecuteScalar - #3947

Merged
paulmedynski merged 3 commits into
release/6.1from
dev/samsharma2700/backport_3912_61
Apr 7, 2026
Merged

[6.1] Propagate Errors from ExecuteScalar#3947
paulmedynski merged 3 commits into
release/6.1from
dev/samsharma2700/backport_3912_61

Conversation

@samsharma2700

@samsharma2700 samsharma2700 commented Feb 10, 2026

Copy link
Copy Markdown
Contributor

Description

Port #3912 to release/6.1 to fix Execute Scalar issue #3736

Issues

Fixes #3736

Copilot AI review requested due to automatic review settings February 10, 2026 23:51
@samsharma2700
samsharma2700 requested a review from a team as a code owner February 10, 2026 23:51
@github-project-automation github-project-automation Bot moved this to To triage in SqlClient Board Feb 10, 2026
Copilot AI reviewed Feb 10, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Ports the fix for #3736 into release/6.1 so ExecuteScalar()/ExecuteScalarAsync() no longer silently ignores server-side errors that arrive after the first row/result, preventing transactional “zombie” scenarios.

Changes:

  • Drain remaining result sets in SqlCommand.CompleteExecuteScalar() (sync) and the ExecuteScalarAsync path to force pending error tokens to surface.
  • Add new manual regression tests for ExecuteScalar/ExecuteScalarAsync, including transactional rollback scenarios.
  • Update an existing multiple-results manual test to reflect the new error-propagation behavior.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs Ensures ExecuteScalar (sync/async) drains remaining results so deferred server errors are propagated.
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs Same ExecuteScalar draining behavior ported to the .NET Framework implementation.
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs Adds manual regression coverage for conversion-error-after-data and transaction rollback behavior.
src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs Updates ExecuteScalar test expectations now that ExecuteScalar drains and throws on later errors.
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj Includes the new manual test file in the test project.

Comment thread src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs Resolved
Comment thread src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs Resolved
Comment thread src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs Resolved
Comment thread ...Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs Resolved
@paulmedynski paulmedynski self-assigned this Feb 11, 2026
@paulmedynski paulmedynski moved this from To triage to In review in SqlClient Board Feb 11, 2026
paulmedynski
paulmedynski previously requested changes Feb 11, 2026
View reviewed changes
Comment thread src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs Resolved
@github-project-automation github-project-automation Bot moved this from In review to In progress in SqlClient Board Feb 11, 2026
@mdaigle mdaigle added this to the 6.1.5 milestone Mar 3, 2026
@mdaigle

mdaigle commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

azure-pipelines Bot commented Apr 2, 2026

Copy link
Copy Markdown
Azure Pipelines successfully started running 2 pipeline(s).

@paulmedynski

paulmedynski commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

@copilot Please create a single PR to address the open conversations.

Copilot AI mentioned this pull request Apr 2, 2026
Merged

Copilot AI commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

@paulmedynski I've opened a new pull request, #4133, to work on those changes. Once the pull request is ready, I'll request review from you.

@paulmedynski
[6.1] Port #3912 to release/6.1 (#4133)
113aab3 
Co-authored-by: paulmedynski <31868385+paulmedynski@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
paulmedynski
paulmedynski reviewed Apr 2, 2026
View reviewed changes
Comment thread src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs Resolved
@paulmedynski
paulmedynski dismissed their stale review April 2, 2026 19:42

Dismissing my request for changes, but not approving.

mdaigle
mdaigle requested changes Apr 3, 2026
View reviewed changes
Comment thread src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs Resolved
@paulmedynski paulmedynski changed the title [6.1] Port #3912 to release/6.1 [6.1] Propagate Errors from ExecuteScalar Apr 6, 2026
@paulmedynski paulmedynski linked an issue Apr 6, 2026 that may be closed by this pull request
Failed transaction unexpectedly leaves data in table #3736
Closed
Copilot AI review requested due to automatic review settings April 6, 2026 11:21
@paulmedynski paulmedynski moved this from In progress to In review in SqlClient Board Apr 6, 2026
@paulmedynski

paulmedynski commented Apr 6, 2026

Copy link
Copy Markdown
Contributor

/azp run

This was referenced Oct 19, 2026
Closed
Closed
Closed
Open
Merged
Closed
Closed
Open
Open
Closed
Closed
Closed
Merged
Open
Open
Open
Open
Open
Open
This was referenced Oct 26, 2026
Closed
Closed
Closed
This was referenced Nov 2, 2026
Closed
Closed
Open
Open
This was referenced Nov 9, 2026
Open
Open
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@mdaigle mdaigle mdaigle approved these changes
@paulmedynski paulmedynski paulmedynski approved these changes
@priyankatiwari08 priyankatiwari08 priyankatiwari08 left review comments

Assignees

@paulmedynski paulmedynski

Labels

None yet

Projects

SqlClient Board
Status: Done

Milestone

6.1.5

Development

Successfully merging this pull request may close these issues.

Failed transaction unexpectedly leaves data in table

6 participants

@samsharma2700 @mdaigle @paulmedynski @priyankatiwari08