Skip to content

Commit e19b3c2

Browse files
committed
NH-4008 - Mark all usages of obsolete drivers so there's no errors.
1 parent 6859ea1 commit e19b3c2

File tree

18 files changed

+54
-5
lines changed

18 files changed

+54
-5
lines changed

src/NHibernate.Test/Async/DriverTest/FirebirdClientDriverFixture.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace NHibernate.Test.DriverTest
2121
using System.Threading.Tasks;
2222
using System.Threading;
2323
[TestFixture]
24+
[Obsolete("Uses old driver")]
2425
public class FirebirdClientDriverFixtureAsync
2526
{
2627
private string _connectionString;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Linq;
1213
using NHibernate.Cfg;
1314
using NHibernate.Connection;
@@ -31,6 +32,7 @@ namespace NHibernate.Test.Futures
3132
/// but this way it's just much easier to test this
3233
/// </summary>
3334
[TestFixture]
35+
[Obsolete("Uses old driver")]
3436
public class FallbackFixtureAsync : FutureFixture
3537
{
3638
protected override bool AppliesTo(Dialect.Dialect dialect)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace NHibernate.Test.NHSpecificTest.NH2660And2661
1818
{
1919
using System.Threading.Tasks;
2020
[TestFixture]
21+
[Obsolete("Uses old driver")]
2122
public class TestAsync : BugTestCase
2223
{
2324
protected override void OnSetUp()

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Data.Common;
1213
using System.Text.RegularExpressions;
1314
using NHibernate.Cfg;
1415
using NHibernate.Dialect;
1516
using NHibernate.Driver;
1617
using NHibernate.Util;
1718
using NUnit.Framework;
19+
using Environment = NHibernate.Cfg.Environment;
1820

1921
namespace NHibernate.Test.NHSpecificTest.NH3202
2022
{
2123
using System.Threading.Tasks;
2224
[TestFixture]
25+
[Obsolete("Uses old driver")]
2326
public class FixtureAsync : BugTestCase
2427
{
2528
protected override void Configure(Configuration configuration)

src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Collections;
1213
using System.Collections.Generic;
1314
using NHibernate.Cfg;
@@ -21,6 +22,7 @@ namespace NHibernate.Test.Pagination
2122
{
2223
using System.Threading.Tasks;
2324
[TestFixture]
25+
[Obsolete("Uses old driver")]
2426
public class CustomDialectFixtureAsync : TestCase
2527
{
2628
protected override string MappingsAssembly

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Data;
23
using System.Data.SqlClient;
34
using System.IO;
@@ -12,13 +13,15 @@
1213
using NHibernate.Linq;
1314
using NHibernate.Type;
1415
using NUnit.Framework;
16+
using Environment = NHibernate.Cfg.Environment;
1517

1618
namespace NHibernate.Test.CfgTest.Loquacious
1719
{
1820
[TestFixture]
1921
public class ConfigurationFixture
2022
{
2123
[Test]
24+
[Obsolete("Uses old driver")]
2225
public void CompleteConfiguration()
2326
{
2427
const string connectionString = "The connection string";

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Data;
23
using NHibernate.AdoNet;
34
using NHibernate.Bytecode;
@@ -10,13 +11,15 @@
1011
using NHibernate.Type;
1112
using NUnit.Framework;
1213
using NHibernate.Exceptions;
14+
using Environment = NHibernate.Cfg.Environment;
1315

1416
namespace NHibernate.Test.CfgTest.Loquacious
1517
{
1618
[TestFixture]
1719
public class LambdaConfigurationFixture
1820
{
1921
[Test]
22+
[Obsolete("Uses old driver")]
2023
public void FullConfiguration()
2124
{
2225
var configure = new Configuration();

src/NHibernate.Test/DriverTest/FirebirdClientDriverFixture.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
namespace NHibernate.Test.DriverTest
1010
{
1111
[TestFixture]
12+
[Obsolete("Uses old driver")]
1213
public class FirebirdClientDriverFixture
1314
{
1415
private string _connectionString;

src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
namespace NHibernate.Test.DriverTest
1414
{
1515
[TestFixture]
16+
[Obsolete("Uses old driver")]
1617
public class OracleDataClientDriverFixture
1718
{
1819
/// <summary>
@@ -151,4 +152,4 @@ private static object GetOracleParameterType(DbParameter dbParameter)
151152
return typeProperty.GetValue(dbParameter);
152153
}
153154
}
154-
}
155+
}

src/NHibernate.Test/Futures/FallbackFixture.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Linq;
23
using NHibernate.Cfg;
34
using NHibernate.Connection;
@@ -10,6 +11,7 @@
1011

1112
namespace NHibernate.Test.Futures
1213
{
14+
[Obsolete("Uses old driver")]
1315
public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
1416
{
1517
public override bool SupportsMultipleQueries => false;
@@ -23,6 +25,7 @@ public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
2325
/// but this way it's just much easier to test this
2426
/// </summary>
2527
[TestFixture]
28+
[Obsolete("Uses old driver")]
2629
public class FallbackFixture : FutureFixture
2730
{
2831
protected override bool AppliesTo(Dialect.Dialect dialect)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace NHibernate.Test.NHSpecificTest.NH2660And2661
88
{
99
[TestFixture]
10+
[Obsolete("Uses old driver")]
1011
public class Test : BugTestCase
1112
{
1213
protected override void OnSetUp()

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
using System.Collections;
1+
using System;
2+
using System.Collections;
23
using NHibernate.SqlCommand;
34
using NUnit.Framework;
45

56
namespace NHibernate.Test.NHSpecificTest.NH3004
67
{
78
[TestFixture]
9+
[Obsolete("Uses old driver")]
810
public class Fixture
911
{
1012
[Test]

src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Data.SqlClient;
23
using NHibernate.AdoNet;
34
using NHibernate.Dialect;
@@ -11,6 +12,7 @@ namespace NHibernate.Test.NHSpecificTest.NH3004
1112
/// <summary>
1213
/// A NHibernate Driver for using the SqlClient DataProvider
1314
/// </summary>
15+
[Obsolete("Uses old driver")]
1416
public class TestSqlClientDriver : SqlClientDriver
1517
{
1618
bool _UseNamedPrefixInSql = true;
@@ -38,4 +40,4 @@ public override bool UseNamedPrefixInParameter
3840
get { return _UseNamedPrefixInParameter; }
3941
}
4042
}
41-
}
43+
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
using System.Data.Common;
1+
using System;
2+
using System.Data.Common;
23
using System.Text.RegularExpressions;
34
using NHibernate.Cfg;
45
using NHibernate.Dialect;
56
using NHibernate.Driver;
67
using NHibernate.Util;
78
using NUnit.Framework;
9+
using Environment = NHibernate.Cfg.Environment;
810

911
namespace NHibernate.Test.NHSpecificTest.NH3202
1012
{
1113
[TestFixture]
14+
[Obsolete("Uses old driver")]
1215
public class Fixture : BugTestCase
1316
{
1417
protected override void Configure(Configuration configuration)
@@ -105,6 +108,7 @@ public class OffsetStartsAtOneTestDialect : MsSql2008Dialect
105108
}
106109

107110

111+
[Obsolete("Uses old driver")]
108112
public class OffsetTestDriver : SqlClientDriver
109113
{
110114
public OffsetStartsAtOneTestDialect OffsetStartsAtOneTestDialect;

src/NHibernate.Test/Pagination/CustomDialectFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using System.Collections.Generic;
34
using NHibernate.Cfg;
@@ -10,6 +11,7 @@
1011
namespace NHibernate.Test.Pagination
1112
{
1213
[TestFixture]
14+
[Obsolete("Uses old driver")]
1315
public class CustomDialectFixture : TestCase
1416
{
1517
protected override string MappingsAssembly

src/NHibernate.Test/Pagination/CustomMsSqlDriver.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Data.Common;
23
using System.Text.RegularExpressions;
34
using NHibernate.Driver;
@@ -9,6 +10,7 @@ namespace NHibernate.Test.Pagination
910
/// Class to work with CustomMsSqlDialect to allow
1011
/// verification of simulated limit parameters
1112
/// </summary>
13+
[Obsolete("Uses old driver")]
1214
public class CustomMsSqlDriver : SqlClientDriver
1315
{
1416
public CustomMsSqlDialect CustomMsSqlDialect;
@@ -33,4 +35,4 @@ protected override void OnBeforePrepare(DbCommand command)
3335
base.OnBeforePrepare(command);
3436
}
3537
}
36-
}
38+
}

src/NHibernate.Test/TestingExtensions.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public static bool IsOleDbDriver(this System.Type driverClass)
3333
/// </summary>
3434
public static bool IsSqlClientDriver(this IDriver driver)
3535
{
36+
#pragma warning disable 618
3637
if (driver is SqlClientDriver) return true;
38+
#pragma warning restore 618
3739
return false;
3840
}
3941

@@ -42,26 +44,34 @@ public static bool IsSqlClientDriver(this IDriver driver)
4244
/// </summary>
4345
public static bool IsSqlClientDriver(this System.Type driverClass)
4446
{
47+
#pragma warning disable 618
4548
if (typeof(SqlClientDriver).IsAssignableFrom(driverClass)) return true;
49+
#pragma warning restore 618
4650
return false;
4751
}
4852

4953
public static bool IsSql2008ClientDriver(this IDriver driver)
5054
{
55+
#pragma warning disable 618
5156
if (driver is Sql2008ClientDriver) return true;
57+
#pragma warning restore 618
5258
return false;
5359
}
5460

5561
public static bool IsMySqlDataDriver(this System.Type driverClass)
5662
{
63+
#pragma warning disable 618
5764
if (typeof(MySqlDataDriver).IsAssignableFrom(driverClass)) return true;
65+
#pragma warning restore 618
5866
return false;
5967
}
6068

6169

6270
public static bool IsFirebirdClientDriver(this IDriver driver)
6371
{
72+
#pragma warning disable 618
6473
if (driver is FirebirdClientDriver) return true;
74+
#pragma warning restore 618
6575
return false;
6676
}
6777

@@ -78,9 +88,11 @@ public static void ClearPoolForFirebirdClientDriver(this IDriver driver)
7888
{
7989
switch (driver)
8090
{
91+
#pragma warning disable 618
8192
case FirebirdClientDriver fbDriver:
8293
fbDriver.ClearPool(null);
8394
break;
95+
#pragma warning restore 618
8496
}
8597
}
8698

@@ -104,7 +116,9 @@ public static bool IsOracleLiteDataClientDriver(this IDriver driver)
104116

105117
public static bool IsOracleManagedDataClientDriver(this IDriver driver)
106118
{
119+
#pragma warning disable 618
107120
if (driver is OracleManagedDataClientDriver) return true;
121+
#pragma warning restore 618
108122
return false;
109123
}
110124
}

src/NHibernate/Dialect/MsSql2008Dialect.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ protected override void RegisterKeywords()
6969
protected override void RegisterDefaultProperties()
7070
{
7171
base.RegisterDefaultProperties();
72+
#pragma warning disable 618
7273
DefaultProperties[Environment.ConnectionDriver] = typeof(Sql2008ClientDriver).AssemblyQualifiedName;
74+
#pragma warning restore 618
7375
}
7476

7577
public override string CurrentTimestampSQLFunctionName =>

0 commit comments

Comments
 (0)