Skip to content

Commit 39a1466

Browse files
committed
NH-4008 - Update driver_class for TeamCity build.
1 parent 3e741d0 commit 39a1466

15 files changed

+28
-28
lines changed

src/NHibernate/Dialect/DB2400Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class DB2400Dialect : DB2Dialect
2323
{
2424
public DB2400Dialect()
2525
{
26-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver";
26+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2400Driver, NHibernate.Driver.AdoNet";
2727
}
2828

2929
public override bool SupportsSequences

src/NHibernate/Dialect/DB2Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public DB2Dialect()
127127
// DB2 does not support ANSI substring syntax.
128128
RegisterFunction("substring", new SQLFunctionTemplate(NHibernateUtil.String, "substring(?1, ?2, ?3)"));
129129

130-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2Driver";
130+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.DB2Driver, NHibernate.Driver.AdoNet";
131131
}
132132

133133
/// <summary></summary>

src/NHibernate/Dialect/FirebirdDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public FirebirdDialect()
4141
RegisterKeywords();
4242
RegisterColumnTypes();
4343
RegisterFunctions();
44-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.FirebirdClientDriver";
44+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.FirebirdClientDriver, NHibernate.Driver.FirebirdClient";
4545
}
4646

4747
public override string AddColumnString

src/NHibernate/Dialect/InformixDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public InformixDialect()
8888
RegisterFunction("instr", new StandardSQLFunction("instr", NHibernateUtil.String));
8989
// actually there is no Instr (or equivalent) in Informix; you have to write your own SPL or UDR
9090

91-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.OdbcDriver";
91+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.OdbcDriver, NHibernate.Driver.Odbc";
9292
DefaultProperties[Environment.PrepareSql] = "true";
9393
}
9494

src/NHibernate/Dialect/IngresDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public IngresDialect()
4949
//RegisterColumnType(DbType.String, 1073741823, "text"); //
5050
//RegisterColumnType(DbType.Time, "time");
5151

52-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.IngresDriver";
52+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.IngresDriver, NHibernate.Driver.AdoNet";
5353
}
5454

5555
#region Overridden informational metadata

src/NHibernate/Dialect/MsSqlCeDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public MsSqlCeDialect()
7171

7272
RegisterFunction("round", new StandardSQLFunction("round"));
7373

74-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SqlServerCeDriver";
74+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SqlServerCompactDriver, NHibernate.Driver.SqlServer.Compact";
7575
DefaultProperties[Environment.PrepareSql] = "false";
7676
}
7777

src/NHibernate/Dialect/MySQLDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public MySQLDialect()
111111
//functions:
112112
RegisterFunctions();
113113

114-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.MySqlDataDriver";
114+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.MySqlDataDriver, NHibernate.Driver.MySql";
115115
}
116116

117117
protected virtual void RegisterFunctions()

src/NHibernate/Dialect/OracleLiteDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class OracleLiteDialect : Oracle9iDialect
2727
public OracleLiteDialect()
2828
{
2929
DefaultProperties[Environment.PrepareSql] = "false";
30-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.OracleLiteDataClientDriver";
30+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.OracleLiteDataClientDriver, NHibernate.Driver.AdoNet";
3131

3232
RegisterColumnType(DbType.AnsiStringFixedLength, "CHAR(255)");
3333
RegisterColumnType(DbType.AnsiStringFixedLength, 2000, "CHAR($l)");

src/NHibernate/Dialect/PostgreSQLDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class PostgreSQLDialect : Dialect
2828
{
2929
public PostgreSQLDialect()
3030
{
31-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.NpgsqlDriver";
31+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.NpgsqlDriver, NHibernate.Driver.Npgsql";
3232

3333
RegisterColumnType(DbType.AnsiStringFixedLength, "char(255)");
3434
RegisterColumnType(DbType.AnsiStringFixedLength, 8000, "char($l)");

src/NHibernate/Dialect/SQLiteDialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected virtual void RegisterKeywords()
121121

122122
protected virtual void RegisterDefaultProperties()
123123
{
124-
DefaultProperties[Cfg.Environment.ConnectionDriver] = "NHibernate.Driver.SQLite20Driver";
124+
DefaultProperties[Cfg.Environment.ConnectionDriver] = "NHibernate.Driver.SQLiteDriver, NHibernate.Driver.SQLite";
125125
DefaultProperties[Cfg.Environment.QuerySubstitutions] = "true 1, false 0, yes 'Y', no 'N'";
126126
}
127127

src/NHibernate/Dialect/SybaseASA9Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class SybaseASA9Dialect : Dialect
3636
{
3737
public SybaseASA9Dialect()
3838
{
39-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseAsaClientDriver";
39+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseAsaClientDriver, NHibernate.Driver.AdoNet";
4040
DefaultProperties[Environment.PrepareSql] = "false";
4141

4242
RegisterColumnType(DbType.AnsiStringFixedLength, 255, "CHAR($l)");

src/NHibernate/Dialect/SybaseASE15Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class SybaseASE15Dialect : Dialect
2929
{
3030
public SybaseASE15Dialect()
3131
{
32-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseAseClientDriver";
32+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseAseClientDriver, NHibernate.Driver.AdoNet";
3333

3434
RegisterColumnType(DbType.Boolean, "tinyint"); // Sybase BIT type does not support null values
3535
RegisterColumnType(DbType.Int16, "smallint");

src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class SybaseSQLAnywhere10Dialect : Dialect
5050
{
5151
public SybaseSQLAnywhere10Dialect()
5252
{
53-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseSQLAnywhereDriver";
53+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseSQLAnywhereDriver, NHibernate.Driver.AdoNet";
5454
DefaultProperties[Environment.PrepareSql] = "false";
5555

5656
RegisterCharacterTypeMappings();

src/NHibernate/Dialect/SybaseSQLAnywhere12Dialect.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class SybaseSQLAnywhere12Dialect : SybaseSQLAnywhere11Dialect
5656
public SybaseSQLAnywhere12Dialect()
5757
: base()
5858
{
59-
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseSQLAnywhereDotNet4Driver";
59+
DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseSQLAnywhereDotNet4Driver, NHibernate.Driver.AdoNet";
6060
RegisterDateTimeTypeMappings();
6161
RegisterKeywords();
6262
}

teamcity.build

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</target>
3737

3838
<target name="setup-teamcity-sqlServerOdbc">
39-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OdbcDriver" />
39+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OdbcDriver, NHibernate.Driver.Odbc" />
4040
<property name="nhibernate.odbc.explicit_datetime_scale" value="3" />
4141
<!-- We need to use a dialect that avoids mapping DbType.Time to TIME on MSSQL. On modern SQL Server
4242
this becomes TIME(7). Later, such values cannot be read back over ODBC. The
@@ -57,7 +57,7 @@
5757
</target>
5858

5959
<target name="setup-teamcity-sqlServerCe32">
60-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerCeDriver" />
60+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerCompactDriver, NHibernate.Driver.SqlServer.Compact" />
6161
<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSqlCe40Dialect" />
6262
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.sdf" />
6363
<property name="nhibernate.command_timeout" value="0" />
@@ -72,7 +72,7 @@
7272

7373
<target name="setup-teamcity-sqlServerCe64">
7474
<property name="nunit-x64" value="true" />
75-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerCeDriver" />
75+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerCompactDriver, NHibernate.Driver.SqlServer.Compact" />
7676
<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSqlCe40Dialect" />
7777
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.sdf" />
7878
<property name="nhibernate.command_timeout" value="0" />
@@ -86,7 +86,7 @@
8686
</target>
8787

8888
<target name="setup-teamcity-firebird32">
89-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
89+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver, NHibernate.Driver.FirebirdClient" />
9090
<property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
9191
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
9292
<copy todir="${bin.dir}">
@@ -101,7 +101,7 @@
101101

102102
<target name="setup-teamcity-firebird64">
103103
<property name="nunit-x64" value="true" />
104-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver" />
104+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.FirebirdClientDriver, NHibernate.Driver.FirebirdClient" />
105105
<property name="nhibernate.dialect" value="NHibernate.Dialect.FirebirdDialect" />
106106
<property name="nhibernate.connection.connection_string" value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
107107
<copy todir="${bin.dir}">
@@ -115,7 +115,7 @@
115115
</target>
116116

117117
<target name="setup-teamcity-sqlite32">
118-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
118+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLiteDriver, NHibernate.Driver.SQLite" />
119119
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
120120
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.db" />
121121
<copy todir="${bin.dir}">
@@ -127,7 +127,7 @@
127127

128128
<target name="setup-teamcity-sqlite64">
129129
<property name="nunit-x64" value="true" />
130-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLite20Driver" />
130+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SQLiteDriver, NHibernate.Driver.SQLite" />
131131
<property name="nhibernate.dialect" value="NHibernate.Dialect.SQLiteDialect" />
132132
<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.db" />
133133
<copy todir="${bin.dir}">
@@ -138,7 +138,7 @@
138138
</target>
139139

140140
<target name="setup-teamcity-postgresql">
141-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.NpgsqlDriver" />
141+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.NpgsqlDriver, NHibernate.Driver.Npgsql" />
142142
<property name="nhibernate.dialect" value="NHibernate.Dialect.PostgreSQL83Dialect" />
143143
<property name="nhibernate.connection.connection_string" value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate" />
144144
<copy todir="${bin.dir}">
@@ -149,15 +149,15 @@
149149
</target>
150150

151151
<target name="setup-teamcity-oracle">
152-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver" />
152+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleClientDriver, NHibernate.Driver.AdoNet" />
153153
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
154154
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=XE" />
155155
<property name="NHibernate.Test.IgnoreFail" value="true" />
156156
<property name="teamcity.last.result" value="${root.dir}/lib/teamcity/oracle/NHibernate.Test.last-results.xml" />
157157
</target>
158158

159159
<target name="setup-teamcity-oracle32">
160-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
160+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver, NHibernate.Driver.AdoNet" />
161161
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
162162
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
163163
<copy todir="${bin.dir}">
@@ -171,7 +171,7 @@
171171

172172
<target name="setup-teamcity-oracle64">
173173
<property name="nunit-x64" value="true" />
174-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver" />
174+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleDataClientDriver, NHibernate.Driver.AdoNet" />
175175
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
176176
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
177177
<copy todir="${bin.dir}">
@@ -184,7 +184,7 @@
184184
</target>
185185

186186
<target name="setup-teamcity-oracle-managed32">
187-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataClientDriver" />
187+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataAccessDriver, NHibernate.Driver.Oracle.ManagedDataAccess" />
188188
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
189189
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
190190
<copy todir="${bin.dir}">
@@ -203,7 +203,7 @@
203203

204204
<target name="setup-teamcity-oracle-managed64">
205205
<property name="nunit-x64" value="true" />
206-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataClientDriver" />
206+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OracleManagedDataAccessDriver, NHibernate.Driver.Oracle.ManagedDataAccess" />
207207
<property name="nhibernate.dialect" value="NHibernate.Dialect.Oracle10gDialect" />
208208
<property name="nhibernate.connection.connection_string" value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
209209
<copy todir="${bin.dir}">
@@ -221,7 +221,7 @@
221221
</target>
222222

223223
<target name="setup-teamcity-mysql">
224-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver" />
224+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver, NHibernate.Driver.MySql" />
225225
<property name="nhibernate.dialect" value="NHibernate.Dialect.MySQL5Dialect" />
226226
<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;" />
227227
<copy todir="${bin.dir}">

0 commit comments

Comments
 (0)