Skip to content

Merge | SqlCommand (Part 1) #3473

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.

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

Merged
merged 22 commits into from
Jul 24, 2025
Merged

Conversation

benrr101
Copy link
Contributor

@benrr101 benrr101 commented Jul 14, 2025

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
…roperty

Transfer all _cachedAsyncState usages to CachedAsyncState
This could be dangerous since property behavior is slightly different than the direct member variable.
@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 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
Copy link
Contributor

@Copilot Copilot AI left a comment

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.

Copy link

codecov bot commented Jul 16, 2025

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.

…functions to align with netfx implementation"

This reverts commit 6fccc8f.

Align netfx implementation with netcore implementation
@benrr101 benrr101 merged commit 9744a8e into main Jul 24, 2025
251 checks passed
@benrr101 benrr101 deleted the dev/russellben/merge/sqlcommand-part1 branch July 24, 2025 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Common Project 🚮 Things that relate to the common project project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants