yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed required Database references to UmbracoDatabase

Browse Source
This commit is contained in:
Shannon Deminick
2012-12-12 05:48:18 +05:00
parent a0e4492a35
commit 1132547c24
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/DatabaseContext.cs
View File

@@ -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.
/// </remarks>
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))
{

2
src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
View File

@@ -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)];
}

2
src/Umbraco.Core/Persistence/Repositories/PetaPocoRepositoryBase.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories
get { return (IDatabaseUnitOfWork)base.UnitOfWork; }
}
protected Database Database
protected UmbracoDatabase Database
{
get { return UnitOfWork.Database; }
}

2
src/Umbraco.Core/Persistence/UnitOfWork/IDatabaseUnitOfWork.cs
View File

@@ -7,6 +7,6 @@ namespace Umbraco.Core.Persistence.UnitOfWork
/// </summary>
public interface IDatabaseUnitOfWork : IUnitOfWork, IDisposable
{
Database Database { get; }
UmbracoDatabase Database { get; }
}
}

4
src/Umbraco.Core/Persistence/UnitOfWork/PetaPocoUnitOfWork.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
private readonly List<Operation> _operations = new List<Operation>();
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