diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
index 82e3a1ff3f..4a30db9cd8 100644
--- a/src/Umbraco.Core/Constants-System.cs
+++ b/src/Umbraco.Core/Constants-System.cs
@@ -1,33 +1,40 @@
namespace Umbraco.Core
{
- public static partial class Constants
- {
- ///
- /// Defines the identifiers for Umbraco system nodes.
- ///
- public static class System
- {
- ///
- /// The integer identifier for global system root node.
- ///
- public const int Root = -1;
+ public static partial class Constants
+ {
+ ///
+ /// Defines the identifiers for Umbraco system nodes.
+ ///
+ public static class System
+ {
+ ///
+ /// The integer identifier for global system root node.
+ ///
+ public const int Root = -1;
- ///
- /// The integer identifier for content's recycle bin.
- ///
- public const int RecycleBinContent = -20;
+ ///
+ /// The integer identifier for content's recycle bin.
+ ///
+ public const int RecycleBinContent = -20;
- ///
- /// The integer identifier for media's recycle bin.
- ///
- public const int RecycleBinMedia = -21;
+ ///
+ /// The integer identifier for media's recycle bin.
+ ///
+ public const int RecycleBinMedia = -21;
- public const int DefaultContentListViewDataTypeId = -95;
+ public const int DefaultContentListViewDataTypeId = -95;
public const int DefaultMediaListViewDataTypeId = -96;
public const int DefaultMembersListViewDataTypeId = -97;
// identifiers for lock objects
- public const int ServersLock = -331;
- }
- }
+ public const int ServersLock = -331;
+ }
+
+ public static class DatabaseProviders
+ {
+ public const string SqlCe = "System.Data.SqlServerCe.4.0";
+ public const string SqlServer = "System.Data.SqlClient";
+ public const string MySql = "MySql.Data.MySqlClient";
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 622dcf564d..05aba6b97d 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -135,7 +135,7 @@ namespace Umbraco.Core
if (string.IsNullOrEmpty(_providerName) == false)
return _providerName;
- _providerName = "System.Data.SqlClient";
+ _providerName = Constants.DatabaseProviders.SqlServer;
if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
{
if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName) == false)
@@ -212,10 +212,10 @@ namespace Umbraco.Core
{
var provider = DbConnectionExtensions.DetectProviderFromConnectionString(connectionString);
var databaseProvider = provider.ToString();
- var providerName = "System.Data.SqlClient";
+ var providerName = Constants.DatabaseProviders.SqlServer;
if (databaseProvider.ToLower().Contains("mysql"))
{
- providerName = "MySql.Data.MySqlClient";
+ providerName = Constants.DatabaseProviders.MySql;
}
SaveConnectionString(connectionString, providerName);
Initialize(string.Empty);
@@ -240,10 +240,10 @@ namespace Umbraco.Core
public string GetDatabaseConnectionString(string server, string databaseName, string user, string password, string databaseProvider, out string providerName)
{
- providerName = "System.Data.SqlClient";
+ providerName = Constants.DatabaseProviders.SqlServer;
if (databaseProvider.ToLower().Contains("mysql"))
{
- providerName = "MySql.Data.MySqlClient";
+ providerName = Constants.DatabaseProviders.MySql;
return string.Format("Server={0}; Database={1};Uid={2};Pwd={3}", server, databaseName, user, password);
}
if (databaseProvider.ToLower().Contains("azure"))
@@ -260,7 +260,7 @@ namespace Umbraco.Core
/// Name of the database
public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
{
- const string providerName = "System.Data.SqlClient";
+ const string providerName = Constants.DatabaseProviders.SqlServer;
var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
SaveConnectionString(connectionString, providerName);
Initialize(providerName);
@@ -373,7 +373,7 @@ namespace Umbraco.Core
var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName];
if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false && string.IsNullOrWhiteSpace(databaseSettings.ProviderName) == false)
{
- var providerName = "System.Data.SqlClient";
+ var providerName = Constants.DatabaseProviders.SqlServer;
string connString = null;
if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
{
@@ -381,6 +381,7 @@ namespace Umbraco.Core
connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
}
Initialize(providerName, connString);
+
}
else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
{
@@ -393,8 +394,8 @@ namespace Umbraco.Core
else if (legacyConnString.ToLowerInvariant().Contains("tcp:"))
{
//Must be sql azure
- SaveConnectionString(legacyConnString, "System.Data.SqlClient");
- Initialize("System.Data.SqlClient");
+ SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
+ Initialize(Constants.DatabaseProviders.SqlServer);
}
else if (legacyConnString.ToLowerInvariant().Contains("datalayer=mysql"))
{
@@ -405,18 +406,19 @@ namespace Umbraco.Core
foreach (var variable in legacyConnString.Split(';').Where(x => x.ToLowerInvariant().StartsWith("datalayer") == false))
connectionStringWithoutDatalayer = string.Format("{0}{1};", connectionStringWithoutDatalayer, variable);
- SaveConnectionString(connectionStringWithoutDatalayer, "MySql.Data.MySqlClient");
- Initialize("MySql.Data.MySqlClient");
+ SaveConnectionString(connectionStringWithoutDatalayer, Constants.DatabaseProviders.MySql);
+ Initialize(Constants.DatabaseProviders.MySql);
}
else
{
//Must be sql
- SaveConnectionString(legacyConnString, "System.Data.SqlClient");
- Initialize("System.Data.SqlClient");
+ SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
+ Initialize(Constants.DatabaseProviders.SqlServer);
}
//Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
+
}
else
{
@@ -461,7 +463,6 @@ namespace Umbraco.Core
Initialize(providerName);
}
-
internal DatabaseSchemaResult ValidateDatabaseSchema()
{
if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
@@ -471,7 +472,7 @@ namespace Umbraco.Core
{
if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
- && ProviderName == "MySql.Data.MySqlClient")
+ && ProviderName == Constants.DatabaseProviders.MySql)
{
throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
}
@@ -680,7 +681,7 @@ namespace Umbraco.Core
private Attempt CheckReadyForInstall()
{
if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
- && ProviderName == "MySql.Data.MySqlClient")
+ && ProviderName == Constants.DatabaseProviders.MySql)
{
throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
}
@@ -729,7 +730,7 @@ namespace Umbraco.Core
{
var dbIsSqlCe = false;
if (databaseSettings != null && databaseSettings.ProviderName != null)
- dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0";
+ dbIsSqlCe = databaseSettings.ProviderName == Constants.DatabaseProviders.SqlCe;
var sqlCeDatabaseExists = false;
if (dbIsSqlCe)
{
diff --git a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs b/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
index 5145ec95c5..c0c7b2a777 100644
--- a/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
+++ b/src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
@@ -42,13 +42,13 @@ namespace Umbraco.Core.Persistence
{
case DatabaseProviders.SqlServer:
case DatabaseProviders.SqlAzure:
- factory = DbProviderFactories.GetFactory("System.Data.SqlClient");
+ factory = DbProviderFactories.GetFactory(Constants.DatabaseProviders.SqlServer);
break;
case DatabaseProviders.SqlServerCE:
factory = DbProviderFactories.GetFactory("System.Data.SqlServerCe.4.0");
break;
case DatabaseProviders.MySql:
- factory = DbProviderFactories.GetFactory("MySql.Data.MySqlClient");
+ factory = DbProviderFactories.GetFactory(Constants.DatabaseProviders.MySql);
break;
case DatabaseProviders.PostgreSQL:
case DatabaseProviders.Oracle:
diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs
index 4f0414ea3b..63278889a2 100644
--- a/src/Umbraco.Core/Persistence/PetaPoco.cs
+++ b/src/Umbraco.Core/Persistence/PetaPoco.cs
@@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence
connectionStringName = ConfigurationManager.ConnectionStrings[0].Name;
// Work out connection string and provider name
- var providerName = "System.Data.SqlClient";
+ var providerName = Constants.DatabaseProviders.SqlServer;
if (ConfigurationManager.ConnectionStrings[connectionStringName] != null)
{
if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[connectionStringName].ProviderName))
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
index 5bd019c4f4..ceb8e9c83f 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
///
/// Represents an SqlSyntaxProvider for MySql
///
- [SqlSyntaxProviderAttribute("MySql.Data.MySqlClient")]
+ [SqlSyntaxProvider(Constants.DatabaseProviders.MySql)]
public class MySqlSyntaxProvider : SqlSyntaxProviderBase
{
private readonly ILogger _logger;
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index 383b310b51..69ebe11a14 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
///
/// Represents an SqlSyntaxProvider for Sql Ce
///
- [SqlSyntaxProviderAttribute("System.Data.SqlServerCe.4.0")]
+ [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlCe)]
public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase
{
public SqlCeSyntaxProvider()
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index 2a873f01bb..4c35c90e1b 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
///
/// Represents an SqlSyntaxProvider for Sql Server
///
- [SqlSyntaxProviderAttribute("System.Data.SqlClient")]
+ [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlServer)]
public class SqlServerSyntaxProvider : MicrosoftSqlSyntaxProviderBase
{
public SqlServerSyntaxProvider()
diff --git a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs
index 26db7ef58c..8b51037d14 100644
--- a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs
+++ b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.Migrations
new AddRedirectUrlTable(SqlSyntax, logger)
);
- var db = new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Logger);
+ var db = new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Logger);
var upgraded = migrationRunner.Execute(db, DatabaseProviders.SqlServerCE, true);
Assert.IsTrue(upgraded);
diff --git a/src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs b/src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
index 5654abfda7..51822c8098 100644
--- a/src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
+++ b/src/Umbraco.Tests/Migrations/TargetVersionSixthMigrationsTest.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Migrations
public UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of());
+ return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of());
}
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/MySqlUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/MySqlUpgradeTest.cs
index bdcb55a4a7..9026c3769f 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/MySqlUpgradeTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/MySqlUpgradeTest.cs
@@ -1,5 +1,6 @@
using Moq;
using NUnit.Framework;
+using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
@@ -26,7 +27,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
public override UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase("Server = 169.254.120.3; Database = upgradetest; Uid = umbraco; Pwd = umbraco", "MySql.Data.MySqlClient", Mock.Of());
+ return new UmbracoDatabase("Server = 169.254.120.3; Database = upgradetest; Uid = umbraco; Pwd = umbraco", Constants.DatabaseProviders.MySql, Mock.Of());
}
public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
index 39ff745e0c..2ea7a40e57 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
@@ -3,6 +3,7 @@ using Moq;
using NUnit.Framework;
using Semver;
using SQLCE4Umbraco;
+using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Migrations;
@@ -64,7 +65,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
public override UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of());
+ return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of());
}
public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
index 33a0dd9ee2..f7080b7bc0 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
@@ -5,6 +5,7 @@ using System.IO;
using Moq;
using NUnit.Framework;
using SQLCE4Umbraco;
+using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
@@ -69,7 +70,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
public override UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of());
+ return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of());
}
public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/SqlServerUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/SqlServerUpgradeTest.cs
index 8b5fc13114..088ea5eedf 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/SqlServerUpgradeTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/SqlServerUpgradeTest.cs
@@ -1,5 +1,6 @@
using Moq;
using NUnit.Framework;
+using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
@@ -24,7 +25,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
public override UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco", "System.Data.SqlClient", Mock.Of());
+ return new UmbracoDatabase(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco", Constants.DatabaseProviders.SqlServer, Mock.Of());
}
public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs
index f22f2413cc..a375eb6850 100644
--- a/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs
+++ b/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs
@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
using Moq;
using NUnit.Framework;
using SQLCE4Umbraco;
+using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Core.ObjectResolution;
@@ -103,7 +104,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
public UmbracoDatabase GetConfiguredDatabase()
{
- return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of());
+ return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of());
}
public string GetDatabaseSpecificSqlScript()
diff --git a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
index e9b58ffcae..bed5582609 100644
--- a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.Persistence
var dbContext = new DatabaseContext(
new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, _logger),
- _logger, SqlSyntaxProvider, "System.Data.SqlServerCe.4.0");
+ _logger, SqlSyntaxProvider, Constants.DatabaseProviders.SqlCe);
var repositoryFactory = new RepositoryFactory(cacheHelper, _logger, SqlSyntaxProvider, SettingsForTests.GenerateMockSettings());
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 866945857a..94f0010201 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Tests.Persistence
{
_dbContext = new DatabaseContext(
new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Mock.Of()),
- Mock.Of(), new SqlCeSyntaxProvider(), "System.Data.SqlServerCe.4.0");
+ Mock.Of(), new SqlCeSyntaxProvider(), Constants.DatabaseProviders.SqlCe);
//unfortunately we have to set this up because the PetaPocoExtensions require singleton access
ApplicationContext.Current = new ApplicationContext(
@@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence
engine.CreateDatabase();
}
- var dbFactory = new DefaultDatabaseFactory(connString, "System.Data.SqlServerCe.4.0", Mock.Of());
+ var dbFactory = new DefaultDatabaseFactory(connString, Constants.DatabaseProviders.SqlCe, Mock.Of());
//re-map the dbcontext to the new conn string
_dbContext = new DatabaseContext(
dbFactory,
diff --git a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
index 841db8198c..6d5f0987eb 100644
--- a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
+++ b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
@@ -1,6 +1,7 @@
using System.Data.SqlClient;
using Moq;
using NUnit.Framework;
+using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
@@ -13,7 +14,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
public void PetaPocoConnection_Cant_Connect_To_SqlDatabase_With_Invalid_User()
{
// Arrange
- const string providerName = "System.Data.SqlClient";
+ const string providerName = Constants.DatabaseProviders.SqlServer;
const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=x;password=umbraco";
var factory = new DefaultDatabaseFactory(connectionString, providerName, Mock.Of());
var database = factory.CreateDatabase();
@@ -27,7 +28,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
public void PetaPocoConnection_Cant_Connect_To_SqlDatabase_Because_Of_Network()
{
// Arrange
- const string providerName = "System.Data.SqlClient";
+ const string providerName = Constants.DatabaseProviders.SqlServer;
const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco";
var factory = new DefaultDatabaseFactory(connectionString, providerName, Mock.Of());
var database = factory.CreateDatabase();
diff --git a/src/Umbraco.Tests/Persistence/MySqlTableByTableTest.cs b/src/Umbraco.Tests/Persistence/MySqlTableByTableTest.cs
index 17d12de478..4b3b9ef51d 100644
--- a/src/Umbraco.Tests/Persistence/MySqlTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/MySqlTableByTableTest.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence
base.Initialize();
_database = new Database("Server = 169.254.120.3; Database = testdb; Uid = umbraco; Pwd = umbraco",
- "MySql.Data.MySqlClient");
+ Constants.DatabaseProviders.MySql);
}
[TearDown]
diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
index 07de6faba7..474735979e 100644
--- a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Tests.Persistence
}
_database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;",
- "System.Data.SqlServerCe.4.0");
+ Constants.DatabaseProviders.SqlCe);
}
[TearDown]
diff --git a/src/Umbraco.Tests/Persistence/SqlTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlTableByTableTest.cs
index f781d38447..0b081628d1 100644
--- a/src/Umbraco.Tests/Persistence/SqlTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/SqlTableByTableTest.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence
base.Initialize();
_database = new Database(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco",
- "System.Data.SqlClient");
+ Constants.DatabaseProviders.SqlServer);
}
[TearDown]
diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs
index 2a4ce8b5ea..69f39392d6 100644
--- a/src/Umbraco.Tests/Services/PerformanceTests.cs
+++ b/src/Umbraco.Tests/Services/PerformanceTests.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Services
protected override string GetDbProviderName()
{
- return "System.Data.SqlClient";
+ return Constants.DatabaseProviders.SqlServer;
}
diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
index ed87493c01..00e744c28b 100644
--- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Services
//it is multi-threaded.
_dbFactory = new PerThreadDatabaseFactory(Logger);
//overwrite the local object
- ApplicationContext.DatabaseContext = new DatabaseContext(_dbFactory, Logger, new SqlCeSyntaxProvider(), "System.Data.SqlServerCe.4.0");
+ ApplicationContext.DatabaseContext = new DatabaseContext(_dbFactory, Logger, new SqlCeSyntaxProvider(), Constants.DatabaseProviders.SqlCe);
//disable cache
var cacheHelper = CacheHelper.CreateDisabledCacheHelper();
diff --git a/src/Umbraco.Tests/TestHelpers/BaseSeleniumTest.cs b/src/Umbraco.Tests/TestHelpers/BaseSeleniumTest.cs
index 2e06998a6a..ef039630f3 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseSeleniumTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseSeleniumTest.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Tests.TestHelpers
var syntaxProvider = new SqlCeSyntaxProvider();
SqlSyntaxContext.SqlSyntaxProvider = syntaxProvider;
- _database = new UmbracoDatabase(connectionString, "System.Data.SqlServerCe.4.0", Mock.Of());
+ _database = new UmbracoDatabase(connectionString, Constants.DatabaseProviders.SqlCe, Mock.Of());
// First remove anything in the database
var creation = new DatabaseSchemaCreation(_database, Mock.Of(), syntaxProvider);
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
index 4b84d7a0a3..642bad4a82 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.TestHelpers
var evtMsgs = new TransientMessagesFactory();
var applicationContext = new ApplicationContext(
//assign the db context
- new DatabaseContext(new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Logger), Logger, sqlSyntax, "System.Data.SqlServerCe.4.0"),
+ new DatabaseContext(new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Logger), Logger, sqlSyntax, Constants.DatabaseProviders.SqlCe),
//assign the service context
new ServiceContext(repoFactory, new PetaPocoUnitOfWorkProvider(Logger), new FileUnitOfWorkProvider(), new PublishingStrategy(evtMsgs, Logger), CacheHelper, Logger, evtMsgs),
CacheHelper,