Skip to content

Commit 5eaf779

Browse files
ngbrownngbrown
committed
NH-4008 - Rename SqlClient to SqlServer
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.
1 parent eca700a commit 5eaf779

34 files changed

+70
-70
lines changed

‎build-common/nhibernate-properties.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
33
<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect" overwrite="false"/>
44
<property name="nhibernate.command_timeout" value="444" overwrite="false"/>
5-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient" overwrite="false"/>
5+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer" overwrite="false"/>
66
<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
77
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ for your own use before compile tests in VisualStudio.
77
<!-- This is the System.Data.dll provider for SQL Server -->
88
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
99
<session-factory name="NHibernate.Test">
10-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property>
10+
<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</property>
1111
<property name="connection.connection_string">
1212
Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
1313
</property>

‎src/NHibernate.Driver.SqlClient/Cfg/Loquacious/ConnectionConfigurationExtensionSqlClient.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/NHibernate.Driver.SqlClient/AdoNet/SqlClientBatchingBatcher.cs renamed to ‎src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcher.cs

File renamed without changes.

‎src/NHibernate.Driver.SqlClient/AdoNet/SqlClientBatchingBatcherFactory.cs renamed to ‎src/NHibernate.Driver.SqlServer/AdoNet/SqlClientBatchingBatcherFactory.cs

File renamed without changes.

‎src/NHibernate.Driver.SqlClient/AdoNet/SqlClientSqlCommandSet.cs renamed to ‎src/NHibernate.Driver.SqlServer/AdoNet/SqlClientSqlCommandSet.cs

File renamed without changes.

‎src/NHibernate.Driver.SqlServer/Cfg/Loquacious/ConnectionConfigurationExtensionSqlServer.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using NHibernate.Driver;
2+
3+
namespace NHibernate.Cfg.Loquacious
4+
{
5+
public static class ConnectionConfigurationExtensionSqlServer
6+
{
7+
public static IConnectionConfiguration BySqlServerDriver(this IConnectionConfiguration cfg)
8+
{
9+
return cfg.By<SqlServerDriver>();
10+
}
11+
12+
public static IConnectionConfiguration BySqlServer2008Driver(this IConnectionConfiguration cfg)
13+
{
14+
return cfg.By<SqlServer2008Driver>();
15+
}
16+
}
17+
}

‎src/NHibernate.Driver.SqlClient/Driver/Sql2008ClientDriver.cs renamed to ‎src/NHibernate.Driver.SqlServer/Driver/SqlServer2008Driver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace NHibernate.Driver
88
{
9-
public class Sql2008ClientDriver : SqlClientDriver
9+
public class SqlServer2008Driver : SqlServerDriver
1010
{
1111
protected override void InitializeParameter(DbParameter dbParam, string name, SqlTypes.SqlType sqlType)
1212
{

‎src/NHibernate.Driver.SqlClient/Driver/SqlClientDriver.cs renamed to ‎src/NHibernate.Driver.SqlServer/Driver/SqlServerDriver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ namespace NHibernate.Driver
99
/// <summary>
1010
/// A NHibernate Driver for using the SqlClient DataProvider
1111
/// </summary>
12-
public class SqlClientDriver : DriverBase, IEmbeddedBatcherFactoryProvider
12+
public class SqlServerDriver : DriverBase, IEmbeddedBatcherFactoryProvider
1313
{
1414
//http://stackoverflow.com/a/7264795/259946
1515

1616
/// <summary>
1717
/// Creates an uninitialized <see cref="DbConnection" /> object for
18-
/// the SqlClientDriver.
18+
/// the SqlServerDriver.
1919
/// </summary>
2020
/// <value>An unitialized <see cref="System.Data.SqlClient.SqlConnection"/> object.</value>
2121
public override DbConnection CreateConnection()
@@ -25,7 +25,7 @@ public override DbConnection CreateConnection()
2525

2626
/// <summary>
2727
/// Creates an uninitialized <see cref="DbCommand" /> object for
28-
/// the SqlClientDriver.
28+
/// the SqlServerDriver.
2929
/// </summary>
3030
/// <value>An unitialized <see cref="System.Data.SqlClient.SqlCommand"/> object.</value>
3131
public override DbCommand CreateCommand()

‎src/NHibernate.Driver.SqlClient/NHibernate.Driver.SqlClient.csproj renamed to ‎src/NHibernate.Driver.SqlServer/NHibernate.Driver.SqlServer.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>NHibernate</RootNamespace>
11-
<AssemblyName>NHibernate.Driver.SqlClient</AssemblyName>
11+
<AssemblyName>NHibernate.Driver.SqlServer</AssemblyName>
1212
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
@@ -21,7 +21,7 @@
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
2323
<NoWarn>1591</NoWarn>
24-
<DocumentationFile>bin\Debug\NHibernate.Driver.SqlClient.xml</DocumentationFile>
24+
<DocumentationFile>bin\Debug\NHibernate.Driver.SqlServer.xml</DocumentationFile>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2727
<DebugType>pdbonly</DebugType>
@@ -31,7 +31,7 @@
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
3333
<NoWarn>1591</NoWarn>
34-
<DocumentationFile>bin\Release\NHibernate.Driver.SqlClient.xml</DocumentationFile>
34+
<DocumentationFile>bin\Release\NHibernate.Driver.SqlServer.xml</DocumentationFile>
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="System" />
@@ -47,10 +47,10 @@
4747
<Compile Include="AdoNet\SqlClientBatchingBatcher.cs" />
4848
<Compile Include="AdoNet\SqlClientBatchingBatcherFactory.cs" />
4949
<Compile Include="AdoNet\SqlClientSqlCommandSet.cs" />
50-
<Compile Include="Cfg\Loquacious\ConnectionConfigurationExtensionSqlClient.cs" />
50+
<Compile Include="Cfg\Loquacious\ConnectionConfigurationExtensionSqlServer.cs" />
5151
<Compile Include="Properties\AssemblyInfo.cs" />
52-
<Compile Include="Driver\Sql2008ClientDriver.cs" />
53-
<Compile Include="Driver\SqlClientDriver.cs" />
52+
<Compile Include="Driver\SqlServer2008Driver.cs" />
53+
<Compile Include="Driver\SqlServerDriver.cs" />
5454
</ItemGroup>
5555
<ItemGroup>
5656
<ProjectReference Include="..\NHibernate\NHibernate.csproj">

‎src/NHibernate.Driver.SqlClient/Properties/AssemblyInfo.cs renamed to ‎src/NHibernate.Driver.SqlServer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
using System.Security;
44

55
[assembly: CLSCompliantAttribute(true)]
6-
[assembly: AssemblyTitleAttribute("NHibernate.Driver.SqlClient")]
6+
[assembly: AssemblyTitleAttribute("NHibernate.Driver.SqlServer")]
77
[assembly: AssemblyDescriptionAttribute("Driver for Microsoft SQL Server to be used with NHibernate 5.")]
88
[assembly: AssemblyCompanyAttribute("NHibernate.info")]
9-
[assembly: AssemblyProductAttribute("NHibernate.Driver.SqlClient")]
9+
[assembly: AssemblyProductAttribute("NHibernate.Driver.SqlServer")]
1010
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
1111
[assembly: AssemblyDelaySignAttribute(false)]
1212
[assembly: AllowPartiallyTrustedCallersAttribute()]

‎src/NHibernate.Example.Web/Web.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
Server=(local);initial catalog=nhibernate;Integrated Security=true
5959
</property>
6060
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
61-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property>
61+
<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</property>
6262
<property name="current_session_context_class">web</property>
6363
</session-factory>
6464
</hibernate-configuration>

‎src/NHibernate.Test/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
3232

33-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property> <!-- Shouldn't be necessary, but is required by some tests -->
33+
<property name="connection.driver_class">NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer</property> <!-- Shouldn't be necessary, but is required by some tests -->
3434
<property name="connection.connection_string_name">TestConnectionString</property>
3535
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
3636
<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->

‎src/NHibernate.Test/CfgTest/ConfigurationFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void ManualConfiguration()
5252

5353
props[Environment.ConnectionProvider] = "NHibernate.Connection.DriverConnectionProvider";
5454
props[Environment.Dialect] = "NHibernate.Dialect.MsSql2000Dialect";
55-
props[Environment.ConnectionDriver] = "NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient";
55+
props[Environment.ConnectionDriver] = "NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer";
5656
props[Environment.ConnectionString] =
5757
"Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI";
5858

‎src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void CompleteConfiguration()
5151
.Each(15)
5252
.Connected
5353
.Through<DebugConnectionProvider>()
54-
.By<SqlClientDriver>()
54+
.By<SqlServerDriver>()
5555
.Releasing(ConnectionReleaseMode.AfterTransaction)
5656
.With(IsolationLevel.ReadCommitted)
5757
.Using(connectionString)
@@ -83,7 +83,7 @@ public void CompleteConfiguration()
8383
Assert.That(cfg.Properties[Environment.BatchStrategy], Is.EqualTo(typeof(SqlClientBatchingBatcherFactory).AssemblyQualifiedName));
8484
Assert.That(cfg.Properties[Environment.BatchSize], Is.EqualTo("15"));
8585
Assert.That(cfg.Properties[Environment.ConnectionProvider], Is.EqualTo(typeof(DebugConnectionProvider).AssemblyQualifiedName));
86-
Assert.That(cfg.Properties[Environment.ConnectionDriver], Is.EqualTo(typeof(SqlClientDriver).AssemblyQualifiedName));
86+
Assert.That(cfg.Properties[Environment.ConnectionDriver], Is.EqualTo(typeof(SqlServerDriver).AssemblyQualifiedName));
8787
Assert.That(cfg.Properties[Environment.ReleaseConnections], Is.EqualTo(ConnectionReleaseModeParser.ToString(ConnectionReleaseMode.AfterTransaction)));
8888
Assert.That(cfg.Properties[Environment.Isolation], Is.EqualTo("ReadCommitted"));
8989
Assert.That(cfg.Properties[Environment.ConnectionString], Is.EqualTo(connectionString));

‎src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void FullConfiguration()
4949
db.Batcher<SqlClientBatchingBatcherFactory>();
5050
db.BatchSize = 15;
5151
db.ConnectionProvider<DebugConnectionProvider>();
52-
db.Driver<SqlClientDriver>();
52+
db.Driver<SqlServerDriver>();
5353
db.ConnectionReleaseMode = ConnectionReleaseMode.AfterTransaction;
5454
db.IsolationLevel = IsolationLevel.ReadCommitted;
5555
db.ConnectionString = "The connection string";
@@ -88,7 +88,7 @@ public void FullConfiguration()
8888
Assert.That(configure.Properties[Environment.ConnectionProvider],
8989
Is.EqualTo(typeof(DebugConnectionProvider).AssemblyQualifiedName));
9090
Assert.That(configure.Properties[Environment.ConnectionDriver],
91-
Is.EqualTo(typeof(SqlClientDriver).AssemblyQualifiedName));
91+
Is.EqualTo(typeof(SqlServerDriver).AssemblyQualifiedName));
9292
Assert.That(configure.Properties[Environment.ReleaseConnections],
9393
Is.EqualTo(ConnectionReleaseModeParser.ToString(ConnectionReleaseMode.AfterTransaction)));
9494
Assert.That(configure.Properties[Environment.Isolation], Is.EqualTo("ReadCommitted"));

‎src/NHibernate.Test/DriverTest/SqlClientDriverFixture.cs renamed to ‎src/NHibernate.Test/DriverTest/SqlServerDriverFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public MultiTypeEntity()
2626
}
2727

2828
[TestFixture]
29-
public class SqlClientDriverFixture : TestCase
29+
public class SqlServerDriverFixture : TestCase
3030
{
3131
protected override string MappingsAssembly
3232
{
@@ -90,8 +90,8 @@ public void Crud()
9090
[Test]
9191
public void QueryPlansAreReused()
9292
{
93-
if (!(Sfi.ConnectionProvider.Driver is SqlClientDriver))
94-
Assert.Ignore("Test designed for SqlClientDriver only");
93+
if (!(Sfi.ConnectionProvider.Driver is SqlServerDriver))
94+
Assert.Ignore("Test designed for SqlServerDriver only");
9595

9696
using (ISession s = OpenSession())
9797
using (ITransaction t = s.BeginTransaction())

‎src/NHibernate.Test/Futures/FallbackFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace NHibernate.Test.Futures
1212
{
13-
public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
13+
public class TestDriverThatDoesntSupportQueryBatching : SqlServerDriver
1414
{
1515
public override bool SupportsMultipleQueries => false;
1616
}
1717

1818
/// <summary>
19-
/// I'm using a Driver which derives from SqlClientDriver to
19+
/// I'm using a Driver which derives from SqlServerDriver to
2020
/// return false for the SupportsMultipleQueries property. This is purely to test the way NHibernate
2121
/// will behave when the driver that's being used does not support multiple queries... so even though
2222
/// 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)
3838
base.Configure(configuration);
3939
using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
4040
{
41-
if (cp.Driver is SqlClientDriver)
41+
if (cp.Driver is SqlServerDriver)
4242
{
4343
configuration.Properties[Environment.ConnectionDriver] =
4444
typeof(TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;

‎src/NHibernate.Test/Insertordering/InsertOrderingFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3939
protected override bool AppliesTo(ISessionFactoryImplementor factory)
4040
{
4141
// Custom batcher does not support oledb driver.
42-
return factory.ConnectionProvider.Driver is SqlClientDriver;
42+
return factory.ConnectionProvider.Driver is SqlServerDriver;
4343
}
4444

4545
protected override void Configure(Configuration configuration)

‎src/NHibernate.Test/NHSpecificTest/NH2660And2661/Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override void Configure(Configuration configuration)
3939
{
4040
// to be sure we are using the new drive
4141
base.Configure(configuration);
42-
configuration.DataBaseIntegration(x=> x.Driver<Sql2008ClientDriver>());
42+
configuration.DataBaseIntegration(x=> x.Driver<SqlServer2008Driver>());
4343
}
4444

4545
[Test]

‎src/NHibernate.Test/NHSpecificTest/NH3004/Fixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void RemoveUnusedCommandParametersBug_1()
1313
/* UseNamedPrefixInSql is true
1414
* UseNamedPrefixInParameter is false
1515
* */
16-
var driver = new TestSqlClientDriver(true, false);
16+
var driver = new TestSqlServerDriver(true, false);
1717

1818
RunTest(driver);
1919
}
@@ -24,12 +24,12 @@ public void RemoveUnusedCommandParametersBug_2()
2424
/* UseNamedPrefixInSql is true
2525
* UseNamedPrefixInParameter is true
2626
* */
27-
var driver = new TestSqlClientDriver(true, true);
27+
var driver = new TestSqlServerDriver(true, true);
2828

2929
RunTest(driver);
3030
}
3131

32-
private static void RunTest(TestSqlClientDriver driver)
32+
private static void RunTest(TestSqlServerDriver driver)
3333
{
3434
var command = driver.CreateCommand();
3535

‎src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs renamed to ‎src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlServerDriver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ namespace NHibernate.Test.NHSpecificTest.NH3004
1111
/// <summary>
1212
/// A NHibernate Driver for using the SqlClient DataProvider
1313
/// </summary>
14-
public class TestSqlClientDriver : SqlClientDriver
14+
public class TestSqlServerDriver : SqlServerDriver
1515
{
1616
bool _UseNamedPrefixInSql = true;
1717
bool _UseNamedPrefixInParameter = false;
1818

19-
public TestSqlClientDriver()
19+
public TestSqlServerDriver()
2020
{
2121

2222
}
2323

24-
public TestSqlClientDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParameter)
24+
public TestSqlServerDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParameter)
2525
{
2626
_UseNamedPrefixInSql = UseNamedPrefixInSql;
2727
_UseNamedPrefixInParameter = UseNamedPrefixInParameter;

‎src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
2424
[Test]
2525
public void ShouldThrowWhenByteArrayTooLong()
2626
{
27-
// For SQL Server only the SqlClientDriver sets parameter lengths
27+
// For SQL Server only the SqlServerDriver sets parameter lengths
2828
// even when there is no length specified in the mapping. The ODBC
2929
// driver won't cause the truncation issue and hence not the exception.
30-
if (!(Sfi.ConnectionProvider.Driver is SqlClientDriver))
30+
if (!(Sfi.ConnectionProvider.Driver is SqlServerDriver))
3131
Assert.Ignore("Test limited to drivers that sets parameter length even with no length specified in the mapping.");
3232

3333
const int reportSize = 17158;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ protected override void Configure(Configuration configuration)
1515
if (!(Dialect is MsSql2008Dialect))
1616
Assert.Ignore("Test is for MS SQL Server dialect only (custom dialect).");
1717

18-
if (!Environment.ConnectionDriver.Contains("SqlClientDriver"))
18+
if (!Environment.ConnectionDriver.Contains("SqlServerDriver"))
1919
Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
2020

2121
cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);
@@ -104,7 +104,7 @@ public class OffsetStartsAtOneTestDialect : MsSql2008Dialect
104104
}
105105

106106

107-
public class OffsetTestDriver : SqlClientDriver
107+
public class OffsetTestDriver : SqlServerDriver
108108
{
109109
public OffsetStartsAtOneTestDialect OffsetStartsAtOneTestDialect;
110110
private int _offsetParameterIndex = 1;

‎src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class Fixture : BugTestCase
1212
{
1313
protected override bool AppliesTo(ISessionFactoryImplementor factory)
1414
{
15-
return factory.ConnectionProvider.Driver is SqlClientDriver;
15+
return factory.ConnectionProvider.Driver is SqlServerDriver;
1616
}
1717

1818
[Test]

‎src/NHibernate.Test/NHSpecificTest/NH3518/XmlColumnTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
2727

2828
protected override bool AppliesTo(ISessionFactoryImplementor factory)
2929
{
30-
return factory.ConnectionProvider.Driver is SqlClientDriver;
30+
return factory.ConnectionProvider.Driver is SqlServerDriver;
3131
}
3232

3333
protected override void Configure(Configuration configuration)

‎src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
<Compile Include="DriverTest\FirebirdClientDriverFixture.cs" />
269269
<Compile Include="DriverTest\ReflectionBasedDriverTest.cs" />
270270
<Compile Include="DriverTest\Sql2008DateTime2Test.cs" />
271-
<Compile Include="DriverTest\SqlClientDriverFixture.cs" />
271+
<Compile Include="DriverTest\SqlServerDriverFixture.cs" />
272272
<Compile Include="DriverTest\SqlServerCeDriverFixture.cs" />
273273
<Compile Include="DynamicProxyTests\GenericMethodsTests\IMyGenericInterface.cs" />
274274
<Compile Include="DynamicProxyTests\GenericMethodsTests\IMyGenericInterfaceBase.cs" />
@@ -1369,7 +1369,7 @@
13691369
<Compile Include="NHSpecificTest\NH2982\Fixture.cs" />
13701370
<Compile Include="NHSpecificTest\NH2982\Model.cs" />
13711371
<Compile Include="NHSpecificTest\NH3004\Fixture.cs" />
1372-
<Compile Include="NHSpecificTest\NH3004\TestSqlClientDriver.cs" />
1372+
<Compile Include="NHSpecificTest\NH3004\TestSqlServerDriver.cs" />
13731373
<Compile Include="NHSpecificTest\NH3074\Fixture.cs" />
13741374
<Compile Include="NHSpecificTest\NH3074\Model.cs" />
13751375
<Compile Include="NHSpecificTest\NH3121\Fixture.cs" />
@@ -2853,7 +2853,7 @@
28532853
<Project>{22409381-1808-4F0A-9C42-9FAA6B3BCFA2}</Project>
28542854
<Name>NHibernate.Driver.Oracle.ManagedDataAccess</Name>
28552855
</ProjectReference>
2856-
<ProjectReference Include="..\NHibernate.Driver.SqlClient\NHibernate.Driver.SqlClient.csproj">
2856+
<ProjectReference Include="..\NHibernate.Driver.SqlServer\NHibernate.Driver.SqlServer.csproj">
28572857
<Project>{cf9feec5-3403-4f3f-9e4f-f0bafe95de39}</Project>
28582858
<Name>NHibernate.Driver.SqlClient</Name>
28592859
</ProjectReference>

‎src/NHibernate.Test/Pagination/CustomMsSqlDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace NHibernate.Test.Pagination
99
/// Class to work with CustomMsSqlDialect to allow
1010
/// verification of simulated limit parameters
1111
/// </summary>
12-
public class CustomMsSqlDriver : SqlClientDriver
12+
public class CustomMsSqlDriver : SqlServerDriver
1313
{
1414
public CustomMsSqlDialect CustomMsSqlDialect;
1515

0 commit comments

Comments
 (0)