Skip to content

fix Query Timeout is overridden #552

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 1 commit into from
Feb 3, 2022
Merged

fix Query Timeout is overridden #552

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions QueryBuilder.Tests/ExecutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,14 @@ public void ShouldThrowException()
new Query("Books").Get();
});
}

[Fact]
public void TimeoutShouldBeCarriedToNewCreatedFactory()
{
var db = new QueryFactory();
db.QueryTimeout = 4000;
var newFactory = QueryExtensions.CreateQueryFactory(db.Query());
Assert.Equal(db.QueryTimeout, newFactory.QueryTimeout);
}
}
}
3 changes: 3 additions & 0 deletions SqlKata.Execution/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("QueryBuilder.Tests")]
2 changes: 1 addition & 1 deletion SqlKata.Execution/Query.Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ internal static XQuery CastToXQuery(Query query, string method = null)

internal static QueryFactory CreateQueryFactory(XQuery xQuery)
{
var factory = new QueryFactory(xQuery.Connection, xQuery.Compiler);
var factory = new QueryFactory(xQuery.Connection, xQuery.Compiler, xQuery.QueryFactory.QueryTimeout);

factory.Logger = xQuery.Logger;

Expand Down