Skip to content

Merge | Fix/commands null #3310

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
merged 4 commits into from
May 8, 2025
Merged

Merge | Fix/commands null #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2be1acd
Return exception when a batch has empty commands list.
deusanyjunior Apr 29, 2025
b9d374d
Add tests.
deusanyjunior Apr 29, 2025
4220f97
Add error message to Resources.
deusanyjunior May 5, 2025
f8cc913
Fixing error in Unit Test. Removing the 's'.
deusanyjunior May 5, 2025
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
5 changes: 5 additions & 0 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#if NET

using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
Expand Down Expand Up @@ -223,6 +224,10 @@ private void SetupBatchCommandExecute()
{
throw ADP.ConnectionRequired(nameof(SetupBatchCommandExecute));
}
if (_commands is null)
{
throw ADP.InvalidOperation(StringsHelper.GetString(Strings.ADP_NoSqlBatchCommandList));
}
_batchCommand.Connection = Connection;
_batchCommand.Transaction = Transaction;
_batchCommand.SetBatchRPCMode(true, _commands.Count);
Expand Down
13 changes: 12 additions & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4740,4 +4740,7 @@
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>Missing the DataColumn '{0}' for the SourceColumn '{2}'.</value>
</data>
<data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
<value>SqlBatchCommand list has not been initialized.</value>
</data>
</root>
11 changes: 11 additions & 0 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ public static void MissingCommandTextThrows()
}
}

[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
public static async Task MissingCommandsThrows()
{
using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
using (var batch = new SqlBatch { Connection = connection })
{
connection.Open();
await Assert.ThrowsAsync<InvalidOperationException>(() => batch.ExecuteReaderAsync());
}
}

[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
public static void MissingConnectionThrows()
{
Expand Down
Loading