Merge | SqlCommand Public Properties #3611
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
* Replace "" with string.Empty
* Removed temp storage of _commandType
…ationAutoEnlist, _sqlDep
…nEnabled, InternalRecordsAffected, _rowsAffected, PropertyChanging()
benrr101
added
the
Common Project 🚮
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR continues the merging of the SqlCommand class across different target frameworks by consolidating public, internal, and protected properties into a shared base implementation. The primary goal is to eliminate code duplication between .NET Framework and .NET Core implementations by moving shared properties to the common SqlCommand.cs file.
Key changes include:
- Moved field declarations and property implementations from platform-specific files to the shared base
- Consolidated property getter/setter logic with minor stylistic improvements
- Standardized the
InvalidCommandTimeoutexception method across platforms
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs | Added shared field declarations, public properties, and internal/protected properties that were previously duplicated across platforms |
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs | Consolidated InvalidCommandTimeout method definitions by moving the version with [CallerMemberName] to the shared location and removing duplicates |
| src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.netfx.cs | Removed field declarations and property implementations that are now in the shared base class |
| src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs | Removed field declarations and property implementations that are now in the shared base class |
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
Outdated
Show resolved
Hide resolved
edwardneal
reviewed
Sep 15, 2025
Contributor
edwardneal
left a comment
edwardneal
left a comment
There was a problem hiding this comment.
One or two comments, but it's great to see this pressing forwards!
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
Outdated
Show resolved
Hide resolved
…r.Refresh on netfx
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3611 +/- ##
===========================================
+ Coverage 65.48% 90.82% +25.33%
===========================================
Files 275 6 -269
Lines 61518 316 -61202
===========================================
- Hits 40288 287 -40001
+ Misses 21230 29 -21201
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
paulmedynski
approved these changes
Sep 17, 2025
benrr101
deleted the
dev/russellben/merge/sqlcommand-nocer-publicprops
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is a continuation of the merge of SqlCommand class. This specifically focuses on merging public, internal, and protected properties. As with the previous PRs, each commit is bite sized and stands on its own. The following members are merged:
_batchRPCMode_columnEncryptionSetting_commandTimeout_designTimeInvisible_notification_notificationAutoEnlist_parameters_pendingCancel_preparedConnectionCloseCount_preparedConnectionReconnectionCount_retryLogicProvider_rowsAffected_sqlDep_statementCompletedEventHandler_transaction_updatedRowSourceColumnEncryptionSettingCommandText-""was replaced withstring.EmptyCommandTimeoutCommandType- removed temp variableConnectionDbConnectionDbParameterCollectionDbTransactionDefaultCommandTimeoutDesignTimeVisibleEnableOptimizedParameterBindingInternalRecordsAffectedInternalTdsConnectionIsColumnEncryptionEnabledNotificationNotificationAutoEnlistParametersPropertyChanging()RetryLogicProviderStatementCompletedStatisticsTransactionUpdatedRowSourceAnd a few changes to things other than SqlCommand:
ADP.InvalidCommandTimeoutwas defined twice in AdapterUtility, once for netfx without[CallerMemberName]and once for netcore with[CallerMemberName]. I standardized on the netcore version and moved it where the rest of the methods live.Issues
Continuation of work for #1261
Testing
Code is moving with minimal stylistic changes here and there. Compilation and CI should be sufficient testing.