Small CommandTimeout corrections.

sdanyliv · sdanyliv · commit ee77d5d26b8f · 2021-01-25T21:54:19.000+02:00
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsDataConnection.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsDataConnection.cs
@@ -58,7 +58,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
-			CopyCommandTimeout();
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -82,7 +82,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
-			CopyCommandTimeout();
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -105,7 +105,7 @@ public LinqToDBForEFToolsDataConnection(
 			Context          = context;
 			_model           = model;
 			_transformFunc   = transformFunc;
-			CopyCommandTimeout();
+			CopyDatabaseProperties();
 			if (LinqToDBForEFTools.EnableChangeTracker)
 				OnEntityCreated += OnEntityCreatedHandler;
 		}
@@ -172,10 +172,11 @@ private void OnEntityCreatedHandler(EntityCreatedEventArgs args)
 			args.Entity = entry.Entity;
 		}
 
-		private void CopyCommandTimeout()
+		private void CopyDatabaseProperties()
 		{
-			this.CommandTimeout = 
-				Context?.Database.GetCommandTimeout() ?? this.CommandTimeout;
+			var commandTimeout = Context?.Database.GetCommandTimeout();
+			if (commandTimeout != null)
+				CommandTimeout = commandTimeout.Value;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public LinqToDBForEFToolsDataConnection(`
`58`	`58`	`Context = context;`
`59`	`59`	`_model = model;`
`60`	`60`	`_transformFunc = transformFunc;`
`61`		`- CopyCommandTimeout();`
	`61`	`+ CopyDatabaseProperties();`
`62`	`62`	`if (LinqToDBForEFTools.EnableChangeTracker)`
`63`	`63`	`OnEntityCreated += OnEntityCreatedHandler;`
`64`	`64`	`}`
`@@ -82,7 +82,7 @@ public LinqToDBForEFToolsDataConnection(`
`82`	`82`	`Context = context;`
`83`	`83`	`_model = model;`
`84`	`84`	`_transformFunc = transformFunc;`
`85`		`- CopyCommandTimeout();`
	`85`	`+ CopyDatabaseProperties();`
`86`	`86`	`if (LinqToDBForEFTools.EnableChangeTracker)`
`87`	`87`	`OnEntityCreated += OnEntityCreatedHandler;`
`88`	`88`	`}`
`@@ -105,7 +105,7 @@ public LinqToDBForEFToolsDataConnection(`
`105`	`105`	`Context = context;`
`106`	`106`	`_model = model;`
`107`	`107`	`_transformFunc = transformFunc;`
`108`		`- CopyCommandTimeout();`
	`108`	`+ CopyDatabaseProperties();`
`109`	`109`	`if (LinqToDBForEFTools.EnableChangeTracker)`
`110`	`110`	`OnEntityCreated += OnEntityCreatedHandler;`
`111`	`111`	`}`
`@@ -172,10 +172,11 @@ private void OnEntityCreatedHandler(EntityCreatedEventArgs args)`
`172`	`172`	`args.Entity = entry.Entity;`
`173`	`173`	`}`
`174`	`174`
`175`		`- private void CopyCommandTimeout()`
	`175`	`+ private void CopyDatabaseProperties()`
`176`	`176`	`{`
`177`		`- this.CommandTimeout =`
`178`		`- Context?.Database.GetCommandTimeout() ?? this.CommandTimeout;`
	`177`	`+ var commandTimeout = Context?.Database.GetCommandTimeout();`
	`178`	`+ if (commandTimeout != null)`
	`179`	`+ CommandTimeout = commandTimeout.Value;`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`}`