[6.1] Fixing NullReferenceException issue with SqlDataAdapter #3846

priyankatiwari08 · 2025-12-15T14:07:24Z

Ports #3749 to release/6.1 branch

Closes #3845

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Removed unused SqlDataAdapterBatchUpdateTests.cs file from project.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 7 comments.

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

…com/dotnet/SqlClient into dev/prtiwar/6.1-SqlDataAdapterIssue

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

apoorvdeshmukh

You may want to resolve the copilot comments

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

Removed EnsureBuyerSellerObjectsExist calls from tests.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated no new comments.

apoorvdeshmukh

To be ported after #3749 is fixed in main

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Copilot · 2025-12-18T08:55:17Z

...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

+  <ItemGroup>
+    <Folder Include="microsoft.data.sqlclient\tests\manualtests\alwaysencrypted\testfixtures\setup\" />
+  </ItemGroup>


This empty Folder ItemGroup is unnecessary and should be removed. Modern SDK-style .csproj files automatically include folders with source files. This element adds no value and creates clutter in the project file. Additionally, the path uses incorrect casing (lowercase instead of proper casing) which doesn't match the actual folder structure.

Suggested change

<ItemGroup>

<Folder Include="microsoft.data.sqlclient\tests\manualtests\alwaysencrypted\testfixtures\setup\" />

</ItemGroup>

Copilot · 2025-12-18T08:55:18Z

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

+            var dt = new DataTable(_tableName);
+            dt.Columns.AddRange(new[]
+            {
+                new DataColumn("BuyerSellerID", typeof(int)),


Disposable 'DataColumn' is created but not disposed.

Copilot · 2025-12-18T08:55:18Z

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

+            dt.Columns.AddRange(new[]
+            {
+                new DataColumn("BuyerSellerID", typeof(int)),
+                new DataColumn("SSN1", typeof(string)),


Disposable 'DataColumn' is created but not disposed.

Copilot · 2025-12-18T08:55:18Z

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

+            {
+                new DataColumn("BuyerSellerID", typeof(int)),
+                new DataColumn("SSN1", typeof(string)),
+                new DataColumn("SSN2", typeof(string)),


Disposable 'DataColumn' is created but not disposed.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Copilot · 2025-12-18T10:16:06Z

...soft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/BuyerSellerTable.cs

+                command.ExecuteNonQuery();
+            }
+
+            // ✅ CHANGED: Use unique SP names


This comment contains checkmark emojis and review-style markers that should be removed. Comments in production code should simply explain the code without review artifacts. Consider removing this comment since the code is self-explanatory.

Copilot · 2025-12-18T10:16:06Z

...soft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/BuyerSellerTable.cs

+                command.ExecuteNonQuery();
+            }
+
+            // ✅ CHANGED: Use unique SP names


This comment contains checkmark emojis and review-style markers that should be removed. Comments in production code should simply explain the code without review artifacts. Consider removing this comment since the code is self-explanatory.

Copilot · 2025-12-18T10:16:07Z

...soft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/BuyerSellerTable.cs

+        private readonly ColumnEncryptionKey _columnEncryptionKey1;
+        private readonly ColumnEncryptionKey _columnEncryptionKey2;
+
+        // ✅ ADD: Unique stored procedure names based on table name


This comment contains checkmark emojis and review-style markers that should be removed. Comments in production code should simply explain the code without review artifacts. Consider changing to a simple explanatory comment or removing it entirely since the property name and implementation are self-explanatory.

Copilot · 2025-12-18T10:16:07Z

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

+            dt.Columns.AddRange(new[]
+            {
+                new DataColumn("BuyerSellerID", typeof(int)),
+                new DataColumn("SSN1", typeof(string)),
+                new DataColumn("SSN2", typeof(string)),
+            });


Disposable 'DataColumn' is created but not disposed.

Suggested change

dt.Columns.AddRange(new[]

{

new DataColumn("BuyerSellerID", typeof(int)),

new DataColumn("SSN1", typeof(string)),

new DataColumn("SSN2", typeof(string)),

});

dt.Columns.Add("BuyerSellerID", typeof(int));

dt.Columns.Add("SSN1", typeof(string));

dt.Columns.Add("SSN2", typeof(string));

Backporting SqlDataAdapter nullreference exception fix

fbdcc90

Copilot AI review requested due to automatic review settings December 15, 2025 14:07

priyankatiwari08 requested a review from a team as a code owner December 15, 2025 14:07

priyankatiwari08 force-pushed the dev/prtiwar/6.1-SqlDataAdapterIssue branch from fbdcc90 to 8291391 Compare December 15, 2025 14:15

priyankatiwari08 closed this Dec 15, 2025

priyankatiwari08 deleted the dev/prtiwar/6.1-SqlDataAdapterIssue branch December 15, 2025 14:16

Backporting SqlDataAdapter null reference exception to MDS v6.1

d98ee90

priyankatiwari08 reopened this Dec 15, 2025

priyankatiwari08 changed the base branch from main to release/6.1 December 15, 2025 14:28

paulmedynski self-assigned this Dec 15, 2025

paulmedynski previously approved these changes Dec 15, 2025

View reviewed changes

priyankatiwari08 added this to the 6.1.4 milestone Dec 15, 2025

apoorvdeshmukh previously approved these changes Dec 15, 2025

View reviewed changes

Copilot AI reviewed Dec 15, 2025

View reviewed changes

Remove SqlDataAdapterBatchUpdateTests from project

aed9e25

Removed unused SqlDataAdapterBatchUpdateTests.cs file from project.

priyankatiwari08 dismissed stale reviews from apoorvdeshmukh and paulmedynski via aed9e25 December 16, 2025 10:15

Copilot AI review requested due to automatic review settings December 16, 2025 10:15

Copilot started reviewing on behalf of priyankatiwari08 December 16, 2025 10:16 View session

Copilot AI reviewed Dec 16, 2025

View reviewed changes

priyankatiwari08 added 3 commits December 16, 2025 16:15

Fixing compilation for SqlDataAdapterBatchUpdateTests.cs

328fa35

Merge branch 'dev/prtiwar/6.1-SqlDataAdapterIssue' of https://github.…

7160abe

…com/dotnet/SqlClient into dev/prtiwar/6.1-SqlDataAdapterIssue

fix

b78f299

Copilot AI review requested due to automatic review settings December 16, 2025 10:48

Copilot started reviewing on behalf of priyankatiwari08 December 16, 2025 10:48 View session

Copilot AI reviewed Dec 16, 2025

View reviewed changes

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs Outdated Show resolved Hide resolved

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs Outdated Show resolved Hide resolved

apoorvdeshmukh previously approved these changes Dec 16, 2025

View reviewed changes

changes per copilot's comment on PR

c9677a8

priyankatiwari08 dismissed apoorvdeshmukh’s stale review via c9677a8 December 16, 2025 11:51

apoorvdeshmukh previously approved these changes Dec 16, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 16, 2025 16:07

priyankatiwari08 dismissed stale reviews from paulmedynski and apoorvdeshmukh via 560d2c6 December 16, 2025 16:07

Copilot AI reviewed Dec 16, 2025

View reviewed changes

Update Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

48fa6a8

Copilot AI review requested due to automatic review settings December 16, 2025 16:09

Copilot AI reviewed Dec 16, 2025

View reviewed changes

Update Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

03398c7

Copilot AI review requested due to automatic review settings December 16, 2025 16:10

Copilot AI reviewed Dec 16, 2025

View reviewed changes

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs Show resolved Hide resolved

Remove EnsureBuyerSellerObjectsExist from tests

c9cfd01

Removed EnsureBuyerSellerObjectsExist calls from tests.

Copilot AI review requested due to automatic review settings December 16, 2025 16:44

Copilot AI reviewed Dec 16, 2025

View reviewed changes

...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs Outdated Show resolved Hide resolved

Refactor SqlDataAdapterBatchUpdateTests for clarity

f0f4d43

Copilot AI review requested due to automatic review settings December 16, 2025 17:16

Copilot AI reviewed Dec 16, 2025

View reviewed changes

apoorvdeshmukh requested changes Dec 17, 2025

View reviewed changes

priyankatiwari08 added 3 commits December 18, 2025 14:16

testcase fixes related to creating unique table and stored procedures

3824beb

.

bbcca93

Refactor SqlDataAdapterBatchUpdateTests for clarity

17bf6a5

Copilot AI review requested due to automatic review settings December 18, 2025 08:50

Copilot started reviewing on behalf of priyankatiwari08 December 18, 2025 08:51 View session

priyankatiwari08 marked this pull request as draft December 18, 2025 08:53

Copilot AI reviewed Dec 18, 2025

View reviewed changes

priyankatiwari08 added 2 commits December 18, 2025 15:09

fix for pipeline failure - changing from truncate to delete

d625cd2

changing ids of the data being inserted

ba78044

Copilot AI review requested due to automatic review settings December 18, 2025 10:08

Copilot started reviewing on behalf of priyankatiwari08 December 18, 2025 10:08 View session

Copilot AI reviewed Dec 18, 2025

View reviewed changes

adding unique ids with data

84f704f

	<ItemGroup>
	<Folder Include="microsoft.data.sqlclient\tests\manualtests\alwaysencrypted\testfixtures\setup\" />
	</ItemGroup>

[6.1] Fixing NullReferenceException issue with SqlDataAdapter #3846

Are you sure you want to change the base?

[6.1] Fixing NullReferenceException issue with SqlDataAdapter #3846

Conversation

priyankatiwari08 commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

apoorvdeshmukh left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

apoorvdeshmukh left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

priyankatiwari08 commented Dec 15, 2025 •

edited

Loading