Skip to content

[6.1] Port #3912 to release/6.1 #4133

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
paulmedynski merged 2 commits into from
Apr 2, 2026
Merged

[6.1] Port #3912 to release/6.1 #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6eb31f
Initial plan
Copilot Apr 2, 2026
e4be130
Address PR review feedback: cancellation handling, primary key, dead …
Copilot Apr 2, 2026
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
11 changes: 9 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2915,8 +2915,15 @@ private Task<object> InternalExecuteScalarAsync(CancellationToken cancellationTo
}
catch (Exception e)
{
// exception thrown by Dispose...
source.SetException(e);
// exception thrown by Dispose or NextResultAsync cancellation...
if (e is OperationCanceledException && cancellationToken.IsCancellationRequested)
{
source.SetCanceled();
}
else
{
source.SetException(e);
}
}
},
TaskScheduler.Default
Expand Down
11 changes: 9 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3130,8 +3130,15 @@ private Task<object> InternalExecuteScalarAsync(CancellationToken cancellationTo
}
catch (Exception e)
{
// exception thrown by Dispose...
source.SetException(e);
// exception thrown by Dispose or NextResultAsync cancellation...
if (e is OperationCanceledException && cancellationToken.IsCancellationRequested)
{
source.SetCanceled();
}
else
{
source.SetException(e);
}
}
},
TaskScheduler.Default
Expand Down
4 changes: 0 additions & 4 deletions ...a.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ public void ExecuteScalar()
{
using SqlConnection connection = new SqlConnection((new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true }).ConnectionString);
using SqlCommand command = connection.CreateCommand();
ConcurrentQueue<string> messages = new ConcurrentQueue<string>();

connection.InfoMessage += (object sender, SqlInfoMessageEventArgs args) =>
messages.Enqueue(args.Message);

connection.Open();

Expand Down
18 changes: 9 additions & 9 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public static void ExecuteScalar_ShouldThrowOnConversionError()
try
{
// Arrange
// Insert valid VARCHAR values - '42-43' is a valid string, not an invalid number
DataTestUtility.CreateTable(connection, tableName, "(Id INT IDENTITY(1,1) NOT NULL, Val VARCHAR(10) NOT NULL)");
// Insert valid VARCHAR values - '42-43' is a valid string but not a valid number
DataTestUtility.CreateTable(connection, tableName, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val VARCHAR(10) NOT NULL)");
using (SqlCommand insertCmd = connection.CreateCommand())
{
insertCmd.CommandText =
Expand Down Expand Up @@ -68,9 +68,9 @@ public static void ExecuteScalar_TransactionShouldRollbackOnError()
try
{
// Arrange
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings
DataTestUtility.CreateTable(connection, sourceTable, "(Id INT IDENTITY(1,1) NOT NULL, Val VARCHAR(10) NOT NULL)");
DataTestUtility.CreateTable(connection, targetTable, "(Id INT IDENTITY(1,1) NOT NULL, Val1 INT NOT NULL, Val2 INT NOT NULL)");
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings but not valid numbers
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is inaccurate: '12345' is a valid number when converting VARCHAR to INT; only '42-43' fails conversion. Consider rewording to avoid implying both values are not valid numbers (e.g., clarify that one value converts and the other does not).

Suggested change
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings but not valid numbers
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings, but only '12345' converts to INT

Copilot uses AI. Check for mistakes.
DataTestUtility.CreateTable(connection, sourceTable, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val VARCHAR(10) NOT NULL)");
DataTestUtility.CreateTable(connection, targetTable, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val1 INT NOT NULL, Val2 INT NOT NULL)");
using (SqlCommand insertCmd = connection.CreateCommand())
{
insertCmd.CommandText =
Expand Down Expand Up @@ -165,7 +165,7 @@ public static async Task ExecuteScalarAsync_ShouldThrowOnConversionError()
try
{
// Arrange
DataTestUtility.CreateTable(connection, tableName, "(Id INT IDENTITY(1,1) NOT NULL, Val VARCHAR(10) NOT NULL)");
DataTestUtility.CreateTable(connection, tableName, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val VARCHAR(10) NOT NULL)");
using (SqlCommand insertCmd = connection.CreateCommand())
{
insertCmd.CommandText =
Expand Down Expand Up @@ -203,9 +203,9 @@ public static async Task ExecuteScalarAsync_TransactionShouldRollbackOnError()
try
{
// Arrange
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings
DataTestUtility.CreateTable(connection, sourceTable, "(Id INT IDENTITY(1,1) NOT NULL, Val VARCHAR(10) NOT NULL)");
DataTestUtility.CreateTable(connection, targetTable, "(Id INT IDENTITY(1,1) NOT NULL, Val1 INT NOT NULL, Val2 INT NOT NULL)");
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings but not valid numbers
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is inaccurate: '12345' converts to INT successfully; the conversion error is caused by the '42-43' row. Rewording this will prevent confusion when interpreting why the WHERE clause throws.

Suggested change
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings but not valid numbers
// sourceTable.Val is VARCHAR - both '12345' and '42-43' are valid strings, but only '42-43' cannot be converted to INT

Copilot uses AI. Check for mistakes.
DataTestUtility.CreateTable(connection, sourceTable, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val VARCHAR(10) NOT NULL)");
DataTestUtility.CreateTable(connection, targetTable, "(Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED, Val1 INT NOT NULL, Val2 INT NOT NULL)");
using (SqlCommand insertCmd = connection.CreateCommand())
{
insertCmd.CommandText =
Expand Down