Skip to content

Commit 87cbcdd

Browse files
ngbrownngbrown
committed
NH-4008 - Enable separate drivers for tests.
1 parent e19b3c2 commit 87cbcdd

File tree

68 files changed

+1161
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1161
-135
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.Sql2008ClientDriver" overwrite="false"/>
5+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServer2008Driver, 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>

‎build-common/teamcity-hibernate.cfg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<property name="format_sql">true</property>
1616

1717
<!-- This is the System.Data.dll provider for MSSQL Server -->
18-
<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
18+
<property name="connection.driver_class">NHibernate.Driver.SqlServer2008Driver, NHibernate.Driver.SqlServer</property>
1919
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
2020
<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
2121
<property name="show_sql">false</property>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ for your own use before compile tests in VisualStudio.
1616
-->
1717
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
1818
<session-factory name="NHibernate.Test">
19-
<property name="connection.driver_class">NHibernate.Driver.FirebirdClientDriver</property>
19+
<property name="connection.driver_class">NHibernate.Driver.FirebirdDriver, NHibernate.Driver.Firebird</property>
2020
<property name="connection.connection_string">
2121
DataSource=localhost;
2222
Database=nhibernate;

‎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.Sql2008ClientDriver</property>
10+
<property name="connection.driver_class">NHibernate.Driver.SqlServer2008Driver, NHibernate.Driver.SqlServer</property>
1111
<property name="connection.connection_string">
1212
Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
1313
</property>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ for your own use before compile tests in VisualStudio.
66
-->
77
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
88
<session-factory name="NHibernate.Test">
9-
<property name="connection.driver_class">NHibernate.Driver.MySqlDataDriver</property>
9+
<property name="connection.driver_class">NHibernate.Driver.MySqlDriver, NHibernate.Driver.MySql</property>
1010
<property name="connection.connection_string">
1111
Database=nhibernate;Data Source=localhost;User Id=nhibernate;Password=;
1212
Protocol=memory;Old Guids=True;
1313
</property>
1414
<property name="dialect">NHibernate.Dialect.MySQL5Dialect</property>
1515
</session-factory>
16-
</hibernate-configuration>
16+
</hibernate-configuration>

‎src/NHibernate.Config.Templates/Oracle-Managed.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.OracleClient.dll provider for Oracle from MS -->
88
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
99
<session-factory name="NHibernate.Test">
10-
<property name="connection.driver_class">NHibernate.Driver.OracleManagedDataClientDriver</property>
10+
<property name="connection.driver_class">NHibernate.Driver.OracleManagedDriver, NHibernate.Driver.Oracle.Managed</property>
1111
<property name="connection.connection_string">
1212
User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = ORCL)))
1313
</property>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ for your own use before compile tests in VisualStudio.
66
-->
77
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
88
<session-factory name="NHibernate.Test">
9-
<property name="connection.driver_class">NHibernate.Driver.NpgsqlDriver</property>
9+
<property name="connection.driver_class">NHibernate.Driver.PostgreSqlDriver, NHibernate.Driver.PostgreSql</property>
1010
<property name="connection.connection_string">
1111
Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Enlist=true;
1212
</property>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ for your own use before compile tests in VisualStudio.
66
-->
77
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
88
<session-factory name="NHibernate.Test">
9-
<property name="connection.driver_class">NHibernate.Driver.SQLite20Driver</property>
9+
<property name="connection.driver_class">NHibernate.Driver.SQLiteDriver, NHibernate.Driver.SQLite</property>
1010
<!-- DateTimeFormatString allows to prevent storing the fact that written date was having kind UTC,
1111
which dodges the undesirable time conversion to local done on reads by System.Data.SQLite.
1212
See https://system.data.sqlite.org/index.html/tktview/44a0955ea344a777ffdbcc077831e1adc8b77a36

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ for your own use before compile tests in VisualStudio.
88
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
99
<session-factory name="NHibernate.Test">
1010
<property name="command_timeout">0</property>
11-
<property name="connection.driver_class">NHibernate.Driver.SqlServerCeDriver</property>
11+
<property name="connection.driver_class">NHibernate.Driver.SqlServerCompactDriver, NHibernate.Driver.SqlServer.Compact</property>
1212
<property name="connection.connection_string">
1313
Data Source=NHibernate.sdf
1414
</property>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFacto
2424
{
2525
db.ConnectionString = @"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true";
2626
db.Dialect<MsSql2008Dialect>();
27-
db.Driver<Sql2008ClientDriver>();
27+
db.SqlServer2008Driver();
2828
})
2929
.AddMapping(domainMapping);
3030
Configuration.SessionFactory().GenerateStatistics();

0 commit comments

Comments
 (0)