Visitar URL original
Merge | SqlCommand (Part 1) by benrr101 · Pull Request #3473 · dotnet/SqlClient · GitHub
Skip to content

Merge | SqlCommand (Part 1) - #3473

Merged
benrr101 merged 22 commits into
mainfrom
dev/russellben/merge/sqlcommand-part1
Jul 24, 2025
Merged

Merge | SqlCommand (Part 1)#3473
benrr101 merged 22 commits into
mainfrom
dev/russellben/merge/sqlcommand-part1

Conversation

@benrr101

@benrr101 benrr101 commented Jul 14, 2025 •
edited by mdaigle
Loading

Copy link
Copy Markdown
Contributor

Description

This PR is a collection of changes to both SqlCommand implementations to bring them closer together. Although the bulk of SqlCommand is the same, it is a huge class and very hard to reconcile all the differences cleanly. I have no idea what's the best way to handle this merge, so I figure I'll do it in chunks that will be digestible.

In this installment, I've tried to tackle the small differences that are just really annoying to go through. These changes includes:

  • Aligning method arguments that are [CallerMemberName] and calls to such methods
  • Sync formatting for method attributes
  • Sync method signatures:
    • TriggerInternalEndAndRetryIfNecessary
    • PrepareForTransparentEncryption
    • TryFetchInputParameterEncryptionInfo
    • ReadDescribeEncryptionParameterResults
    • RunExecuteNonQueryTds
    • RunExecuteReaderTdsWithTransparentParameterEncryption
    • RunExecuteReaderTds
    • OnDone
  • Align names
    • KeysToBeSentToEnclave
    • RequiresEnclaveComputations
    • ShouldCacheEncryptionMetadata
  • Align visibility
    • CancelIgnoreFailureCallback
    • CancelIgnoreFailure
  • Align ordering
    • ExecuteReader methods
    • CancelIgnoreFailureCallback
    • CancelIgnoreFailure
    • Clone, ICloneable.Clone
  • Remove unsed debug methods CompletePendingReadWithSuccess CompletePendingReadWithFailure
  • Sync method body expression formatting
    • BeginExecuteReader*
    • ExecuteNonQueryAsync*
    • ExecuteReaderAsync*
    • ExecuteXmReaderAsync*
  • Sync _prepareHandle type
  • Rename CachedAsyncState to AsyncState, change name of property to CachedAsyncState, replace usages of _cachedAsyncState to the property this could be dangerous
  • Sync async parameters/variables to isAsync
  • Sync inRetry parameters to isRetry
  • Sync event/trace/correlation messages to netcore style
  • Sync/fix typos, low-risk formatting changes

Issues

Testing

Code changes are pretty low stakes syncing between the two implementations. CI should be suitable to vaidate.

benrr101 added 21 commits July 11, 2025 17:35
@benrr101
Aligning CallerMemberName arguments
d78c53c
@benrr101
Sync TriggerInternalEndAndRetryIfNecessary signatures (as part of syn…
73dd08a 
…cing method name parameters)
@benrr101
Sync attribute formatting and some low stakes stylistic/typo stuff
904bb06
@benrr101
Move ExecuteReader methods to align with netcore implementation
8b97a46
@benrr101
Remove SqlCommand from TriggerInternalEndAndRetryIfNecessary function…
6fccc8f 
…s to align with netfx implementation
@benrr101
Round one of syncing method signatures
75765ed
@benrr101
Align keysToBeSentToEnclave, requiresEnclaveComputations, ShouldCache…
64244b2 
…EncryptionMetadata
@benrr101
Align CancelIgnoreFailureCallback and CancelIgnoreFailure
780cf6c
@benrr101
Remove unsed CompletePendingReadWith* Methods
29dd1ff
@benrr101
Align Write*ExecuteEvent methods
ee0660b
@benrr101
Align Clone, ICloneable.Clone and NotifyDependency
61a5e28
@benrr101
Align BeginExecuteReader and ExecuteReader methods as per netcore imp…
1d4a266 
…lementation
@benrr101
Align InternalExecuteNonQueryWithRetryAsync
2c0b6b6
@benrr101
Align ExecuteReaderAsync methods
0b85116
@benrr101
Align ExecuteXmlReaderAsync methods
e78f841
@benrr101
Sync some more things, like spaces, comments
8f4252b
@benrr101
sync _prepareHandle
8bce702
@benrr101
Rename CachedAsyncState to AsyncState to allow for CachedAsyncState p…
b3cd36d 
…roperty

Transfer all _cachedAsyncState usages to CachedAsyncState
This could be dangerous since property behavior is slightly different than the direct member variable.
@benrr101
sync isRetry and isAsync variable names
fdbe141
@benrr101
Sync { // lines
3ae6f88
@benrr101
Sync event/trace/correlation messages
1aca93c
@benrr101 benrr101 added this to the 7.0-preview1 milestone Jul 14, 2025
@benrr101 benrr101 added the Common Project 🚮 Things that relate to the common project project label Jul 14, 2025
Copilot AI review requested due to automatic review settings July 14, 2025 19:17
@benrr101
benrr101 requested a review from a team as a code owner July 14, 2025 19:17
Copilot AI reviewed Jul 14, 2025
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.

Copilot wasn't able to review any files in this pull request.

@codecov

codecov Bot commented Jul 16, 2025 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.78%. Comparing base (8eb9f32) to head (c5920a9).
Report is 28 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #3473      +/-   ##
==========================================
- Coverage   68.86%   67.78%   -1.08%     
==========================================
  Files         280      277       -3     
  Lines       62417    62389      -28     
==========================================
- Hits        42982    42293     -689     
- Misses      19435    20096     +661
Flag Coverage Δ
addons 91.04% <ø> (-1.54%) ⬇️
netcore 72.86% <ø> (+0.11%) ⬆️
netfx 66.57% <ø> (-1.47%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

mdaigle
mdaigle requested changes Jul 17, 2025
View reviewed changes
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 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
@benrr101
Revert "Remove SqlCommand from TriggerInternalEndAndRetryIfNecessary …
c5920a9 
…functions to align with netfx implementation"

This reverts commit 6fccc8f.

Align netfx implementation with netcore implementation
This was referenced Nov 6, 2026
Closed
Open
Open
Closed
Merged
Open
Closed
Closed
Closed
Open
Merged
Closed
Merged
Open
Open
@MZurmuehlen89 MZurmuehlen89 mentioned this pull request Nov 10, 2026
Closed
This was referenced Nov 10, 2026
Open
Closed
Open
Closed
Merged
Merged
Open
Open
Open
Open
Open
Open
Open
Open
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

Assignees

No one assigned

Labels

Common Project 🚮 Things that relate to the common project project

Projects

None yet

Milestone

7.0-preview1

Development

Successfully merging this pull request may close these issues.

4 participants

@benrr101 @mdaigle @paulmedynski