Skip to content

Revert "Fixing NullReferenceException issue with SqlDataAdapter (#3749)" #3854

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.

Sign up for GitHub

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
apoorvdeshmukh merged 1 commit into from
Dec 18, 2025
Merged

Revert "Fixing NullReferenceException issue with SqlDataAdapter (#3749)" #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(
// not present as the rpcName, as is the case with non-_batchRPCMode. So
// input parameters start at parameters[1]. parameters[0] is the actual
// T-SQL Statement. rpcName is sp_executesql.
if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)
if (_RPCList[i].systemParams.Length > 1)
{
_RPCList[i].needsFetchParameterEncryptionMetadata = true;

Expand Down
255 changes: 0 additions & 255 deletions ...rosoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup Condition="'$(TestSet)' == 'AE'">
<Compile Include="AlwaysEncrypted\SqlDataAdapterBatchUpdateTests.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TestSet)' == '' or '$(TestSet)' == 'AE'">
<Compile Include="AlwaysEncrypted\ConversionTests.cs" />
<Compile Include="AlwaysEncrypted\ExceptionsGenericError.cs" />
Expand Down
Loading