NH-4008 - Rename SqlClient to SqlServer

ngbrown · ngbrown · commit fb7c533c8c75 · 2017-08-20T23:10:47.000-07:00
No time like making a breaking change, than when everything is changing
anyways.

Lines up better with how other ORM's drivers are listed on NuGet.
diff --git a/build-common/nhibernate-properties.xml b/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, NHibernate.Driver.SqlClient" overwrite="false"/>
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>
diff --git a/build-common/teamcity-hibernate.cfg.xml b/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, NHibernate.Driver.SqlClient</property>
+			<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</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>
diff --git a/src/NHibernate.Config.Templates/MSSQL.cfg.xml b/src/NHibernate.Config.Templates/MSSQL.cfg.xml
@@ -7,7 +7,7 @@ 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, NHibernate.Driver.SqlClient</property>
+		<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</property>
 		<property name="connection.connection_string">
 			Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
 		</property>
diff --git a/src/NHibernate.Driver.SqlClient/Cfg/ConnectionConfigurationExtensionSqlClient.cs b/src/NHibernate.Driver.SqlClient/Cfg/ConnectionConfigurationExtensionSqlClient.cs
diff --git a/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcher.cs b/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcher.cs
diff --git a/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcherFactory.cs b/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcherFactory.cs
diff --git a/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientSqlCommandSet.cs b/src/NHibernate.Driver.SqlServer/AdoNet/SqlClientSqlCommandSet.cs
diff --git a/src/NHibernate.Driver.SqlServer/Cfg/ConnectionConfigurationExtensionSqlServer.cs b/src/NHibernate.Driver.SqlServer/Cfg/ConnectionConfigurationExtensionSqlServer.cs
@@ -0,0 +1,18 @@
+﻿using NHibernate.Cfg.Loquacious;
+using NHibernate.Driver;
+
+namespace NHibernate.Cfg
+{
+	public static class ConnectionConfigurationExtensionSqlServer
+	{
+		public static IConnectionConfiguration BySqlServerDriver(this IConnectionConfiguration cfg)
+		{
+			return cfg.By<SqlServerDriver>();
+		}
+
+		public static IConnectionConfiguration BySql2008ServerDriver(this IConnectionConfiguration cfg)
+		{
+			return cfg.By<SqlServer2008Driver>();
+		}
+	}
+}
diff --git a/src/NHibernate.Driver.SqlServer/Driver/SqlServer2008Driver.cs b/src/NHibernate.Driver.SqlServer/Driver/SqlServer2008Driver.cs
@@ -6,7 +6,7 @@
 
 namespace NHibernate.Driver
 {
-	public class Sql2008ClientDriver : SqlClientDriver
+	public class SqlServer2008Driver : SqlServerDriver
 	{
 		protected override void InitializeParameter(DbParameter dbParam, string name, SqlTypes.SqlType sqlType)
 		{
diff --git a/src/NHibernate.Driver.SqlServer/Driver/SqlServerDriver.cs b/src/NHibernate.Driver.SqlServer/Driver/SqlServerDriver.cs
@@ -9,13 +9,13 @@ namespace NHibernate.Driver
 	/// <summary>
 	/// A NHibernate Driver for using the SqlClient DataProvider
 	/// </summary>
-	public class SqlClientDriver : DriverBase, IEmbeddedBatcherFactoryProvider
+	public class SqlServerDriver : DriverBase, IEmbeddedBatcherFactoryProvider
 	{
 		//http://stackoverflow.com/a/7264795/259946
 
 		/// <summary>
 		/// Creates an uninitialized <see cref="DbConnection" /> object for
-		/// the SqlClientDriver.
+		/// the SqlServerDriver.
 		/// </summary>
 		/// <value>An unitialized <see cref="System.Data.SqlClient.SqlConnection"/> object.</value>
 		public override DbConnection CreateConnection()
@@ -25,7 +25,7 @@ public override DbConnection CreateConnection()
 
 		/// <summary>
 		/// Creates an uninitialized <see cref="DbCommand" /> object for
-		/// the SqlClientDriver.
+		/// the SqlServerDriver.
 		/// </summary>
 		/// <value>An unitialized <see cref="System.Data.SqlClient.SqlCommand"/> object.</value>
 		public override DbCommand CreateCommand()
diff --git a/src/NHibernate.Driver.SqlServer/NHibernate.Driver.SqlServer.csproj b/src/NHibernate.Driver.SqlServer/NHibernate.Driver.SqlServer.csproj
diff --git a/src/NHibernate.Everything.sln b/src/NHibernate.Everything.sln
@@ -89,7 +89,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Driver.Oracle.Ma
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Driver.SQLite", "NHibernate.Driver.SQLite\NHibernate.Driver.SQLite.csproj", "{99FE5A5C-F732-40A3-BEE6-ED5ADC393862}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Driver.SqlClient", "NHibernate.Driver.SqlClient\NHibernate.Driver.SqlClient.csproj", "{CF9FEEC5-3403-4F3F-9E4F-F0BAFE95DE39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Driver.SqlServer", "NHibernate.Driver.SqlServer\NHibernate.Driver.SqlServer.csproj", "{CF9FEEC5-3403-4F3F-9E4F-F0BAFE95DE39}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Driver.SqlServer.Compact", "NHibernate.Driver.SqlServer.Compact\NHibernate.Driver.SqlServer.Compact.csproj", "{11B3C504-D501-4766-AC36-0CF1A813815B}"
 EndProject
diff --git a/src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs b/src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs
@@ -25,7 +25,7 @@ public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFacto
 				.Integrate
 					.Using<MsSql2008Dialect>()
 					.Connected
-						.BySqlClientDriver()
+						.BySqlServerDriver()
 						.Using(@"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true");
 
 			cfg.AddMapping(domainMapping);
diff --git a/src/NHibernate.Example.Web/NHibernate.Example.Web.csproj b/src/NHibernate.Example.Web/NHibernate.Example.Web.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NHibernate.Driver.SqlClient\NHibernate.Driver.SqlClient.csproj" />
+    <ProjectReference Include="..\NHibernate.Driver.SqlServer\NHibernate.Driver.SqlServer.csproj" />
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />
   </ItemGroup>
 
diff --git a/src/NHibernate.Test/App.config b/src/NHibernate.Test/App.config
@@ -30,7 +30,7 @@
 			
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property> <!-- Shouldn't be necessary, but is required by some tests -->
+			<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</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 -->
diff --git a/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs b/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs
@@ -52,7 +52,7 @@ public void ManualConfiguration()
 
 			props[Environment.ConnectionProvider] = "NHibernate.Connection.DriverConnectionProvider";
 			props[Environment.Dialect] = "NHibernate.Dialect.MsSql2000Dialect";
-			props[Environment.ConnectionDriver] = "NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient";
+			props[Environment.ConnectionDriver] = "NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer";
 			props[Environment.ConnectionString] =
 				"Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI";
 
diff --git a/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs b/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs
@@ -51,7 +51,7 @@ public void CompleteConfiguration()
 						.Each(15)
 					.Connected
 						.Through<DebugConnectionProvider>()
-						.By<SqlClientDriver>()
+						.By<SqlServerDriver>()
 						.Releasing(ConnectionReleaseMode.AfterTransaction)
 						.With(IsolationLevel.ReadCommitted)
 						.Using(connectionString)
@@ -83,7 +83,7 @@ public void CompleteConfiguration()
 			Assert.That(cfg.Properties[Environment.BatchStrategy], Is.EqualTo(typeof(SqlClientBatchingBatcherFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.BatchSize], Is.EqualTo("15"));
 			Assert.That(cfg.Properties[Environment.ConnectionProvider], Is.EqualTo(typeof(DebugConnectionProvider).AssemblyQualifiedName));
-			Assert.That(cfg.Properties[Environment.ConnectionDriver], Is.EqualTo(typeof(SqlClientDriver).AssemblyQualifiedName));
+			Assert.That(cfg.Properties[Environment.ConnectionDriver], Is.EqualTo(typeof(SqlServerDriver).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.ReleaseConnections], Is.EqualTo(ConnectionReleaseModeParser.ToString(ConnectionReleaseMode.AfterTransaction)));
 			Assert.That(cfg.Properties[Environment.Isolation], Is.EqualTo("ReadCommitted"));
 			Assert.That(cfg.Properties[Environment.ConnectionString], Is.EqualTo(connectionString));
diff --git a/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs b/src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs
@@ -49,7 +49,7 @@ public void FullConfiguration()
 												db.Batcher<SqlClientBatchingBatcherFactory>();
 												db.BatchSize = 15;
 												db.ConnectionProvider<DebugConnectionProvider>();
-												db.Driver<SqlClientDriver>();
+												db.Driver<SqlServerDriver>();
 												db.ConnectionReleaseMode = ConnectionReleaseMode.AfterTransaction;
 												db.IsolationLevel = IsolationLevel.ReadCommitted;
 												db.ConnectionString = "The connection string";
@@ -88,7 +88,7 @@ public void FullConfiguration()
 			Assert.That(configure.Properties[Environment.ConnectionProvider],
 						Is.EqualTo(typeof(DebugConnectionProvider).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.ConnectionDriver],
-						Is.EqualTo(typeof(SqlClientDriver).AssemblyQualifiedName));
+						Is.EqualTo(typeof(SqlServerDriver).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.ReleaseConnections],
 									Is.EqualTo(ConnectionReleaseModeParser.ToString(ConnectionReleaseMode.AfterTransaction)));
 			Assert.That(configure.Properties[Environment.Isolation], Is.EqualTo("ReadCommitted"));
diff --git a/src/NHibernate.Test/DriverTest/SqlServerDriverFixture.cs b/src/NHibernate.Test/DriverTest/SqlServerDriverFixture.cs
@@ -26,7 +26,7 @@ public MultiTypeEntity()
 	}
 
 	[TestFixture]
-	public class SqlClientDriverFixture : TestCase
+	public class SqlServerDriverFixture : TestCase
 	{
 		protected override string MappingsAssembly
 		{
@@ -90,8 +90,8 @@ public void Crud()
 		[Test]
 		public void QueryPlansAreReused()
 		{
-			if (!(Sfi.ConnectionProvider.Driver is SqlClientDriver))
-				Assert.Ignore("Test designed for SqlClientDriver only");
+			if (!(Sfi.ConnectionProvider.Driver is SqlServerDriver))
+				Assert.Ignore("Test designed for SqlServerDriver only");
 
 			using (ISession s = OpenSession())
 			using (ITransaction t = s.BeginTransaction())
diff --git a/src/NHibernate.Test/Futures/FallbackFixture.cs b/src/NHibernate.Test/Futures/FallbackFixture.cs
@@ -10,13 +10,13 @@
 
 namespace NHibernate.Test.Futures
 {
-	public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
+	public class TestDriverThatDoesntSupportQueryBatching : SqlServerDriver
 	{
 		public override bool SupportsMultipleQueries => false;
 	}
 
 	/// <summary>
-	/// I'm using a Driver which derives from SqlClientDriver to
+	/// I'm using a Driver which derives from SqlServerDriver to
 	/// return false for the SupportsMultipleQueries property. This is purely to test the way NHibernate
 	/// will behave when the driver that's being used does not support multiple queries... so even though
 	/// the test is using MsSql, it's only relevant for databases that don't support multiple queries
@@ -38,7 +38,7 @@ protected override void Configure(Configuration configuration)
 			base.Configure(configuration);
 			using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
 			{
-				if (cp.Driver is SqlClientDriver)
+				if (cp.Driver is SqlServerDriver)
 				{
 					configuration.Properties[Environment.ConnectionDriver] =
 						typeof(TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;
diff --git a/src/NHibernate.Test/Insertordering/InsertOrderingFixture.cs b/src/NHibernate.Test/Insertordering/InsertOrderingFixture.cs
@@ -40,7 +40,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
 			// Custom batcher does not support oledb driver.
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		protected override void Configure(Configuration configuration)
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs b/src/NHibernate.Test/NHSpecificTest/NH1553/MsSQL/SnapshotIsolationUpdateConflictTest.cs
@@ -131,7 +131,7 @@ protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
 			// SQLUpdateConflictToStaleStateExceptionConverter is specific to Sql client driver, and does not work
 			// with Odbc (and likeley Oledb).
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		private void SetAllowSnapshotIsolation(bool on)
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2020/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2020/Fixture.cs
@@ -26,7 +26,7 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
 			// Use a SQL Server Client exception converter, cannot work for ODBC or OleDb
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		protected override void OnTearDown()
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2660And2661/Test.cs b/src/NHibernate.Test/NHSpecificTest/NH2660And2661/Test.cs
@@ -39,7 +39,7 @@ protected override void Configure(Configuration configuration)
 				{
 					// to be sure we are using the new drive
 					base.Configure(configuration);
-					configuration.DataBaseIntegration(x=> x.Driver<Sql2008ClientDriver>());
+					configuration.DataBaseIntegration(x=> x.Driver<SqlServer2008Driver>());
 				}
 
 		[Test]
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3004/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3004/Fixture.cs
@@ -13,7 +13,7 @@ public void RemoveUnusedCommandParametersBug_1()
 			/* UseNamedPrefixInSql       is true 
 			 * UseNamedPrefixInParameter is false
 			 * */
-			var driver = new TestSqlClientDriver(true, false);
+			var driver = new TestSqlServerDriver(true, false);
 
 			RunTest(driver);
 		}
@@ -24,12 +24,12 @@ public void RemoveUnusedCommandParametersBug_2()
 			/* UseNamedPrefixInSql       is true 
 			 * UseNamedPrefixInParameter is true
 			 * */
-			var driver = new TestSqlClientDriver(true, true);
+			var driver = new TestSqlServerDriver(true, true);
 
 			RunTest(driver);
 		}
 
-		private static void RunTest(TestSqlClientDriver driver)
+		private static void RunTest(TestSqlServerDriver driver)
 		{
 			var command = driver.CreateCommand();
 
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlServerDriver.cs b/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlServerDriver.cs
@@ -11,17 +11,17 @@ namespace NHibernate.Test.NHSpecificTest.NH3004
 	/// <summary>
 	/// A NHibernate Driver for using the SqlClient DataProvider
 	/// </summary>
-	public class TestSqlClientDriver : SqlClientDriver
+	public class TestSqlServerDriver : SqlServerDriver
 	{
 		bool _UseNamedPrefixInSql = true;
 		bool _UseNamedPrefixInParameter = false;
 
-		public TestSqlClientDriver()
+		public TestSqlServerDriver()
 		{
 
 		}
 
-		public TestSqlClientDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParameter)
+		public TestSqlServerDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParameter)
 		{
 			_UseNamedPrefixInSql = UseNamedPrefixInSql;
 			_UseNamedPrefixInParameter = UseNamedPrefixInParameter;
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs
@@ -24,10 +24,10 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		[Test]
 		public void ShouldThrowWhenByteArrayTooLong()
 		{
-			// For SQL Server only the SqlClientDriver sets parameter lengths
+			// For SQL Server only the SqlServerDriver sets parameter lengths
 			// even when there is no length specified in the mapping. The ODBC
 			// driver won't cause the truncation issue and hence not the exception.
-			if (!(Sfi.ConnectionProvider.Driver is SqlClientDriver))
+			if (!(Sfi.ConnectionProvider.Driver is SqlServerDriver))
 				Assert.Ignore("Test limited to drivers that sets parameter length even with no length specified in the mapping.");
 
 			const int reportSize = 17158;
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs
@@ -15,7 +15,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 (!Environment.ConnectionDriver.Contains("SqlServerDriver"))
 				Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
 
 			cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);
@@ -104,7 +104,7 @@ public class OffsetStartsAtOneTestDialect : MsSql2008Dialect
 	}
 
 
-	public class OffsetTestDriver : SqlClientDriver
+	public class OffsetTestDriver : SqlServerDriver
 	{
 		public OffsetStartsAtOneTestDialect OffsetStartsAtOneTestDialect;
 		private int _offsetParameterIndex = 1;
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs
@@ -12,7 +12,7 @@ public class Fixture : BugTestCase
 	{
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		[Test]
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3405/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3405/Fixture.cs
@@ -34,7 +34,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
 			// No Xml support with Odbc (and likely OleDb too).
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		protected override HbmMapping GetMappings()
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3518/XmlColumnTest.cs b/src/NHibernate.Test/NHSpecificTest/NH3518/XmlColumnTest.cs
@@ -27,7 +27,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		protected override void Configure(Configuration configuration)
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -57,7 +57,7 @@
     <ProjectReference Include="..\NHibernate.Driver.Odbc\NHibernate.Driver.Odbc.csproj" />
     <ProjectReference Include="..\NHibernate.Driver.OleDb\NHibernate.Driver.OleDb.csproj" />
     <ProjectReference Include="..\NHibernate.Driver.Oracle.ManagedDataAccess\NHibernate.Driver.Oracle.ManagedDataAccess.csproj" />
-    <ProjectReference Include="..\NHibernate.Driver.SqlClient\NHibernate.Driver.SqlClient.csproj" />
+    <ProjectReference Include="..\NHibernate.Driver.SqlServer\NHibernate.Driver.SqlServer.csproj" />
     <ProjectReference Include="..\NHibernate.Driver.SQLite\NHibernate.Driver.SQLite.csproj" />
     <ProjectReference Include="..\NHibernate.Driver.SqlServer.Compact\NHibernate.Driver.SqlServer.Compact.csproj" />
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />
diff --git a/src/NHibernate.Test/Pagination/CustomDialectFixture.cs b/src/NHibernate.Test/Pagination/CustomDialectFixture.cs
@@ -29,7 +29,7 @@ protected override void Configure(Configuration configuration)
 			if (!(Dialect is MsSql2005Dialect))
 				Assert.Ignore("Test is for SQL dialect only");
 			var driverClass = ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver));
-			if (!typeof(SqlClientDriver).IsAssignableFrom(driverClass))
+			if (!typeof(SqlServerDriver).IsAssignableFrom(driverClass))
 				Assert.Ignore("Test is compatible only with Sql Server Client driver connection strings");
 
 			cfg.SetProperty(Environment.Dialect, typeof(CustomMsSqlDialect).AssemblyQualifiedName);
diff --git a/src/NHibernate.Test/Pagination/CustomMsSqlDriver.cs b/src/NHibernate.Test/Pagination/CustomMsSqlDriver.cs
@@ -9,7 +9,7 @@ namespace NHibernate.Test.Pagination
 	/// Class to work with CustomMsSqlDialect to allow
 	/// verification of simulated limit parameters
 	/// </summary>
-	public class CustomMsSqlDriver : SqlClientDriver
+	public class CustomMsSqlDriver : SqlServerDriver
 	{
 		public CustomMsSqlDialect CustomMsSqlDialect;
 
diff --git a/src/NHibernate.Test/SqlTest/Identity/MsSQL/MSSQLIdentityInsertWithStoredProcsTest.cs b/src/NHibernate.Test/SqlTest/Identity/MsSQL/MSSQLIdentityInsertWithStoredProcsTest.cs
@@ -17,7 +17,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 		protected override bool AppliesTo(ISessionFactoryImplementor factory)
 		{
 			// Tested resulting SQL depends on driver.
-			return factory.ConnectionProvider.Driver is SqlClientDriver;
+			return factory.ConnectionProvider.Driver is SqlServerDriver;
 		}
 
 		protected override string GetExpectedInsertOrgLogStatement(string orgName)
diff --git a/src/NHibernate.Test/TestEmbeddedConfig.cfg.xml b/src/NHibernate.Test/TestEmbeddedConfig.cfg.xml
diff --git a/src/NHibernate.Test/TypesTest/StringTypeWithLengthFixture.cs b/src/NHibernate.Test/TypesTest/StringTypeWithLengthFixture.cs
diff --git a/src/NHibernate.Test/TypesTest/XDocTypeFixture.cs b/src/NHibernate.Test/TypesTest/XDocTypeFixture.cs
diff --git a/src/NHibernate.Test/TypesTest/XmlDocTypeFixture.cs b/src/NHibernate.Test/TypesTest/XmlDocTypeFixture.cs
diff --git a/src/NHibernate.TestDatabaseSetup/App.config b/src/NHibernate.TestDatabaseSetup/App.config
diff --git a/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs b/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
diff --git a/src/NHibernate.sln b/src/NHibernate.sln
diff --git a/src/NHibernate/Dialect/MsSql2000Dialect.cs b/src/NHibernate/Dialect/MsSql2000Dialect.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace NHibernate.Driver`
`8`	`8`	`{`
`9`		`- public class Sql2008ClientDriver : SqlClientDriver`
	`9`	`+ public class SqlServer2008Driver : SqlServerDriver`
`10`	`10`	`{`
`11`	`11`	`protected override void InitializeParameter(DbParameter dbParam, string name, SqlTypes.SqlType sqlType)`
`12`	`12`	`{`