Merge pull request #97 from linq2db/master

Release 5.1.1

Author: sdanyliv

Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsDataConnection.cs

@@ -58,6 +58,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -81,6 +82,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -103,6 +105,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -169,5 +172,11 @@ private void OnEntityCreatedHandler(EntityCreatedEventArgs args)
 			args.Entity = entry.Entity;
 		}
 
+		private void CopyDatabaseProperties()
+		{
+			var commandTimeout = Context?.Database.GetCommandTimeout();
+			if (commandTimeout != null)
+				CommandTimeout = commandTimeout.Value;
+		}
 	}
 }

Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/Northwind/NorthwindContext.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using LinqToDB.EntityFrameworkCore.BaseTests.Models.Northwind;
 using LinqToDB.EntityFrameworkCore.SqlServer.Tests.Models.Northwind.Mapping;
 using LinqToDB.Expressions;
@@ -28,6 +29,12 @@ public NorthwindContext(DbContextOptions options) : base(options)
 
 		}
 
+		[DbFunction("ProcessLong", "dbo")]
+		public static int ProcessLong(int seconds)
+		{
+			throw new NotImplementedException();
+		}
+
 		protected override void OnModelCreating(ModelBuilder builder)
 		{
 			builder.ApplyConfiguration(new CategoriesMap());

Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs

@@ -774,5 +774,50 @@ public void TestNullability([Values(true, false)] bool enableFilter)
 		}
 
 
+		[Test]
+		public void TestCommandTimeout()
+		{
+			int timeoutErrorCode = -2;     // Timeout Expired
+			int commandTimeout = 1;
+			int commandExecutionTime = 5;
+			var createProcessLongFunctionSql =   // function that takes @secondsNumber seconds
+				@"CREATE OR ALTER FUNCTION dbo.[ProcessLong]
+					(
+						@secondsNumber int
+					)
+					RETURNS int
+					AS
+					BEGIN
+						declare @startTime datetime = getutcdate()
+						while datediff(second, @startTime, getutcdate()) < @secondsNumber
+						begin
+							set @startTime = @startTime
+						end
+						return 1
+					END";
+			var dropProcessLongFunctionSql = @"DROP FUNCTION IF EXISTS [dbo].[ProcessLong]";
+
+			using (var ctx = CreateContext(false))
+			{
+				try
+				{
+					ctx.Database.ExecuteSqlRaw(createProcessLongFunctionSql);
+					ctx.Database.SetCommandTimeout(commandTimeout);
+
+					var query = from p in ctx.Products
+								select NorthwindContext.ProcessLong(commandExecutionTime);
+
+					var exception = Assert.Throws<Microsoft.Data.SqlClient.SqlException>(() =>
+					{
+						var result = query.ToLinqToDB().First();
+					});
+					Assert.AreEqual(exception.Number, timeoutErrorCode);
+				}
+				finally
+				{
+					ctx.Database.ExecuteSqlRaw(dropProcessLongFunctionSql);
+				}
+			}
+		}
 	}
 }

azure-pipelines.yml

@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 5.1.0
-  nugetVersion: 5.1.0
+  assemblyVersion: 5.1.1
+  nugetVersion: 5.1.1
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):