Revert "Fixing NullReferenceException issue with SqlDataAdapter (#3749)" #3854
+1
−259
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
This reverts commit c23fed6.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts commit c23fed6, which previously fixed a NullReferenceException issue with SqlDataAdapter. The revert is associated with issue AB#41152.
Key changes:
- Removes null check for
systemParamsin encryption metadata fetching logic - Deletes the entire SqlDataAdapterBatchUpdateTests test file
- Removes test file reference from the project file
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| SqlCommand.Encryption.cs | Reverts null check for systemParams before accessing its Length property in batch RPC encryption metadata handling |
| SqlDataAdapterBatchUpdateTests.cs | Completely removes test file that validated batch update scenarios with Always Encrypted |
| Microsoft.Data.SqlClient.ManualTesting.Tests.csproj | Removes conditional compilation entry for the deleted test file |
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
Show resolved
Hide resolved
...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
Show resolved
Hide resolved
paulmedynski
approved these changes
Dec 18, 2025
mdaigle
approved these changes
Dec 18, 2025
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.
This reverts commit c23fed6.
The test will be fixed through another PR that brings back the fix and testcase for #3716.
Issues
AB#41152
Guidelines
Please review the contribution guidelines before submitting a pull request: