Switch from old SqlClientDriver to Sql2008ClientDriver

Author: fredericDelaporte

build-common/nhibernate-properties.xml

@@ -2,6 +2,6 @@
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
 	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect"  overwrite="false"/>
 	<property name="nhibernate.command_timeout" value="444"  overwrite="false"/>
-	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.Sql2008ClientDriver" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>

build-common/teamcity-hibernate.cfg.xml

@@ -15,7 +15,7 @@
 			<property name="format_sql">true</property>
 
 			<!-- This is the System.Data.dll provider for MSSQL Server -->
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 			<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
 			<property name="show_sql">false</property>

src/NHibernate.Config.Templates/MSSQL.cfg.xml

@@ -7,10 +7,10 @@ for your own use before compile tests in VisualStudio.
 <!-- This is the System.Data.dll provider for SQL Server -->
 <hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
 	<session-factory name="NHibernate.Test">
-		<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+		<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
 		<property name="connection.connection_string">
 			Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
 		</property>
 		<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 	</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs

@@ -24,7 +24,7 @@ public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFacto
 				{
 					db.ConnectionString = @"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true";
 					db.Dialect<MsSql2008Dialect>();
-					db.Driver<SqlClientDriver>();
+					db.Driver<Sql2008ClientDriver>();
 				})
 				.AddMapping(domainMapping);
 			Configuration.SessionFactory().GenerateStatistics();
@@ -37,4 +37,4 @@ public ISession OpenSession()
 			return SessionFactory.OpenSession();
 		}
 	}
-}
+}

src/NHibernate.Test/App.config

@@ -30,7 +30,7 @@
 
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
+			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
 			<property name="connection.connection_string_name">TestConnectionString</property>
 			<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
 			<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->

src/NHibernate.Test/Async/Hql/Ast/LimitClauseFixture.cs

@@ -10,7 +10,9 @@
 
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.Driver;
 using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Hql.Ast
@@ -22,7 +24,8 @@ public class LimitClauseFixtureAsync : BaseFixture
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect.SupportsVariableLimit
-				&& !(Dialect is Dialect.MsSql2000Dialect &&  cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
+				&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
+					typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)))); 
 		}
 
 		protected override void OnSetUp()
@@ -186,4 +189,4 @@ public async Task TakeWithParameterAsync()
 			s.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs

@@ -12,6 +12,7 @@
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1144
@@ -36,7 +37,7 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public async Task CanSaveInSingleBatchAsync()
 		{
-			if (configuration.Properties[Environment.ConnectionDriver].Contains(typeof (OracleDataClientDriver).Name) == false)
+			if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 			{
 				Assert.Ignore("Only applicable for Oracle Data Client driver");
 			}
@@ -85,4 +86,4 @@ public async Task CanSaveInSingleBatchAsync()
 			Assert.IsTrue(executedBatch);
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs

@@ -13,6 +13,7 @@
 using NHibernate.Cfg;
 using NHibernate.Dialect;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3202
@@ -26,7 +27,7 @@ protected override void Configure(Configuration configuration)
 			if (!(Dialect is MsSql2008Dialect))
 				Assert.Ignore("Test is for MS SQL Server dialect only (custom dialect).");
 
-			if (!Environment.ConnectionDriver.Contains("SqlClientDriver"))
+			if (!typeof(SqlClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 				Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
 
 			cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);

src/NHibernate.Test/Hql/Ast/LimitClauseFixture.cs

@@ -1,6 +1,8 @@
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.Driver;
 using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Hql.Ast
@@ -11,7 +13,8 @@ public class LimitClauseFixture : BaseFixture
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect.SupportsVariableLimit
-				&& !(Dialect is Dialect.MsSql2000Dialect &&  cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
+				&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
+					typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)))); 
 		}
 
 		protected override void OnSetUp()
@@ -175,4 +178,4 @@ public void TakeWithParameter()
 			s.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH1144/Fixture.cs

@@ -2,6 +2,7 @@
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1144
@@ -25,7 +26,7 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public void CanSaveInSingleBatch()
 		{
-			if (configuration.Properties[Environment.ConnectionDriver].Contains(typeof (OracleDataClientDriver).Name) == false)
+			if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 			{
 				Assert.Ignore("Only applicable for Oracle Data Client driver");
 			}
@@ -74,4 +75,4 @@ public void CanSaveInSingleBatch()
 			Assert.IsTrue(executedBatch);
 		}
 	}
-}
+}