From 1132547c24d0fee5a718efc01415b3d0a0d4f845 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Wed, 12 Dec 2012 05:48:18 +0500 Subject: [PATCH] Changed required Database references to UmbracoDatabase --- src/Umbraco.Core/DatabaseContext.cs | 4 ++-- src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs | 2 +- .../Persistence/Repositories/PetaPocoRepositoryBase.cs | 2 +- .../Persistence/UnitOfWork/IDatabaseUnitOfWork.cs | 2 +- src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs index bc463d72f4..986ea70baa 100644 --- a/src/Umbraco.Core/DatabaseContext.cs +++ b/src/Umbraco.Core/DatabaseContext.cs @@ -59,7 +59,7 @@ namespace Umbraco.Core /// This should not be used for CRUD operations or queries against the /// standard Umbraco tables! Use the Public services for that. /// - public Database Database + public UmbracoDatabase Database { get { return _factory.CreateDatabase(); } } @@ -318,7 +318,7 @@ namespace Umbraco.Core try { - var database = new Database(_connectionString, ProviderName); + var database = new UmbracoDatabase(_connectionString, ProviderName); //If Configuration Status is empty its a new install - otherwise upgrade the existing if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)) { diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs index 257b2017ef..22a888c13c 100644 --- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs +++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs @@ -38,7 +38,7 @@ namespace Umbraco.Core.Persistence //we have an http context, so only create one per request if (!HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory))) { - HttpContext.Current.Items.Add(typeof(DefaultDatabaseFactory), new Database(GlobalSettings.UmbracoConnectionName)); + HttpContext.Current.Items.Add(typeof(DefaultDatabaseFactory), new UmbracoDatabase(GlobalSettings.UmbracoConnectionName)); } return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)]; } diff --git a/src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs index 6ccbe5d004..f286392e87 100644 --- a/src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs @@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories get { return (IDatabaseUnitOfWork)base.UnitOfWork; } } - protected Database Database + protected UmbracoDatabase Database { get { return UnitOfWork.Database; } } diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWork.cs b/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWork.cs index 8653733677..616009988f 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWork.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWork.cs @@ -7,6 +7,6 @@ namespace Umbraco.Core.Persistence.UnitOfWork /// public interface IDatabaseUnitOfWork : IUnitOfWork, IDisposable { - Database Database { get; } + UmbracoDatabase Database { get; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs b/src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs index 896ac82d0f..4fb2e42bb8 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs @@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork private readonly List _operations = new List(); - public PetaPocoUnitOfWork(Database database) + public PetaPocoUnitOfWork(UmbracoDatabase database) { Database = database; _key = Guid.NewGuid(); @@ -113,7 +113,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork get { return _key; } } - public Database Database { get; private set; } + public UmbracoDatabase Database { get; private set; } #region Operation