Make SqlClientBatchingBatcher respect CommandTimeout seting in configuration

Fixes #1158

Author: hazzik

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs

@@ -3,8 +3,8 @@
 using System.Data.Common;
 using System.Text;
 using NHibernate.AdoNet.Util;
+using NHibernate.Driver;
 using NHibernate.Exceptions;
-using NHibernate.Util;
 
 namespace NHibernate.AdoNet
 {
@@ -20,7 +20,7 @@ public SqlClientBatchingBatcher(ConnectionManager connectionManager, IIntercepto
 			: base(connectionManager, interceptor)
 		{
 			_batchSize = Factory.Settings.AdoBatchSize;
-			_defaultTimeout = PropertiesHelper.GetInt32(Cfg.Environment.CommandTimeout, Cfg.Environment.Properties, -1);
+			_defaultTimeout = Driver.GetCommandTimeout();
 
 			_currentBatch = CreateConfiguredBatch();
 			//we always create this, because we need to deal with a scenario in which

src/NHibernate/Async/AdoNet/SqlClientBatchingBatcher.cs

@@ -13,8 +13,8 @@
 using System.Data.Common;
 using System.Text;
 using NHibernate.AdoNet.Util;
+using NHibernate.Driver;
 using NHibernate.Exceptions;
-using NHibernate.Util;
 
 namespace NHibernate.AdoNet
 {

src/NHibernate/Driver/DriverBase.cs

@@ -345,5 +345,11 @@ public DbParameter GenerateOutputParameter(DbCommand command)
 
 		/// <inheritdoc />
 		public virtual DateTime MinDate => DateTime.MinValue;
+
+		//6.0 TODO: Add property definition to IDialect
+		/// <summary>
+		/// Get the timeout in seconds for ADO.NET queries.
+		/// </summary>
+		public virtual int CommandTimeout => commandTimeout;
 	}
 }

src/NHibernate/Driver/DriverExtensions.cs

@@ -2,6 +2,7 @@
 using System.Data.Common;
 using NHibernate.AdoNet;
 using NHibernate.SqlTypes;
+using NHibernate.Util;
 
 namespace NHibernate.Driver
 {
@@ -13,6 +14,15 @@ internal static void AdjustParameterForValue(this IDriver driver, DbParameter pa
 			adjustingDriver?.AdjustParameterForValue(parameter, sqlType, value);
 		}
 
+		//6.0 TODO: inline
+		internal static int GetCommandTimeout(this IDriver driver)
+		{
+			if (driver is DriverBase driverBase)
+				return driverBase.CommandTimeout;
+
+			return PropertiesHelper.GetInt32(Cfg.Environment.CommandTimeout, Cfg.Environment.Properties, -1);
+		}
+
 		// 6.0 TODO: merge into IDriver
 		/// <summary>
 		/// Begin an ADO <see cref="DbTransaction" />.