Skip to content

33196 command timeout allow zero #33198

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 3 commits into from
Mar 1, 2024
+31 −1
Merged

33196 command timeout allow zero #33198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1ecfb5
Allow zero for WithCommandTimeout.
Feb 29, 2024
67e8bc7
Allow zero for WithCommandTimeout.
Feb 29, 2024
2869534
Merge branch '33196_CommandTimeout_allow_zero' of https://github.com/…
Feb 29, 2024
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/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public virtual int? CommandTimeout
/// <returns>A new instance with the option changed.</returns>
public virtual RelationalOptionsExtension WithCommandTimeout(int? commandTimeout)
{
if (commandTimeout is <= 0)
if (commandTimeout is < 0)
{
throw new InvalidOperationException(RelationalStrings.InvalidCommandTimeout(commandTimeout));
}
Expand Down
30 changes: 30 additions & 0 deletions test/EFCore.Relational.Tests/RelationalConnectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,26 @@ public void Can_create_new_connection_with_CommandTimeout()
Assert.Equal(99, connection.CommandTimeout);
}

[ConditionalFact]
public void Can_create_new_connection_with_CommandTimeout_set_to_zero()
{
using var connection = new FakeRelationalConnection(
CreateOptions(
new FakeRelationalOptionsExtension()
.WithConnectionString("Database=FrodoLives")
.WithCommandTimeout(0)));
Assert.Equal(0, connection.CommandTimeout);
}

[ConditionalFact]
public void Throws_if_create_new_connection_with_CommandTimeout_negative()
{
Assert.Throws<InvalidOperationException>(
() => new FakeRelationalOptionsExtension()
.WithConnectionString("Database=FrodoLives")
.WithCommandTimeout(-1));
}

[ConditionalFact]
public void Can_set_CommandTimeout()
{
Expand All @@ -898,6 +918,16 @@ public void Can_set_CommandTimeout()
Assert.Equal(88, connection.CommandTimeout);
}

[ConditionalFact]
public void Can_set_CommandTimeout_to_zero()
{
using var connection = new FakeRelationalConnection(
CreateOptions(new FakeRelationalOptionsExtension().WithConnectionString("Database=FrodoLives")));
connection.CommandTimeout = 0;

Assert.Equal(0, connection.CommandTimeout);
}

[ConditionalFact]
public void Throws_if_CommandTimeout_out_of_range()
{
Expand Down