Skip to content

Commit 298af7f

Browse files
Merge pull request #552 from sqlkata/fix/query-timeout
fix Query Timeout is overridden
2 parents 8ae0e9d + 5fa2c83 commit 298af7f

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

QueryBuilder.Tests/ExecutionTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,14 @@ public void ShouldThrowException()
1414
new Query("Books").Get();
1515
});
1616
}
17+
18+
[Fact]
19+
public void TimeoutShouldBeCarriedToNewCreatedFactory()
20+
{
21+
var db = new QueryFactory();
22+
db.QueryTimeout = 4000;
23+
var newFactory = QueryExtensions.CreateQueryFactory(db.Query());
24+
Assert.Equal(db.QueryTimeout, newFactory.QueryTimeout);
25+
}
1726
}
1827
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo("QueryBuilder.Tests")]

SqlKata.Execution/Query.Extensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ internal static XQuery CastToXQuery(Query query, string method = null)
366366

367367
internal static QueryFactory CreateQueryFactory(XQuery xQuery)
368368
{
369-
var factory = new QueryFactory(xQuery.Connection, xQuery.Compiler);
369+
var factory = new QueryFactory(xQuery.Connection, xQuery.Compiler, xQuery.QueryFactory.QueryTimeout);
370370

371371
factory.Logger = xQuery.Logger;
372372

0 commit comments

Comments
 (0)