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

Persistence reorg, killed DatabaseContext

Browse Source
This commit is contained in:
Stephan
2016-12-16 17:56:10 +01:00
parent 49d54f497d
commit 7f39f7748f
69 changed files with 413 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/umbraco.cms/businesslogic/CMSNode.cs
View File

@@ -987,7 +987,7 @@ order by level,sortOrder";
{
var xmlDoc = new XmlDocument();
var xmlStr = Current.DatabaseContext.Database.ExecuteScalar<string>(
var xmlStr = Current.DatabaseFactory.Database.ExecuteScalar<string>(
"select xml from cmsPreviewXml where nodeID = @nodeId and versionId = @versionId",
new { nodeId = Id, versionId = version });
@@ -1000,7 +1000,7 @@ order by level,sortOrder";
protected internal virtual bool PreviewExists(Guid versionId)
{
return Current.DatabaseContext.Database.ExecuteScalar<int>(
return Current.DatabaseFactory.Database.ExecuteScalar<int>(
"SELECT COUNT(nodeId) FROM cmsPreviewXml WHERE nodeId=@nodeId and versionId = @versionId",
new {nodeId = Id, versionId = versionId}) != 0;
@@ -1017,7 +1017,7 @@ order by level,sortOrder";
var sql = PreviewExists(versionId) ? "UPDATE cmsPreviewXml SET xml = @xml, timestamp = @timestamp WHERE nodeId=@nodeId AND versionId = @versionId"
: "INSERT INTO cmsPreviewXml(nodeId, versionId, timestamp, xml) VALUES (@nodeId, @versionId, @timestamp, @xml)";
Current.DatabaseContext.Database.Execute(
Current.DatabaseFactory.Database.Execute(
sql, new {nodeId = Id, versionId = versionId, timestamp = DateTime.Now, xml = x.OuterXml});
}

4
src/umbraco.cms/businesslogic/Content.cs
View File

@@ -197,7 +197,7 @@ namespace umbraco.cms.businesslogic
if (_versionDateInitialized) return _versionDate;
// content & media have a version date in cmsContentVersion that is updated when saved - use it
var db = Current.DatabaseContext.Database;
var db = Current.DatabaseFactory.Database;
_versionDate = db.ExecuteScalar<DateTime>("SELECT versionDate FROM cmsContentVersion WHERE versionId=@versionId",
new { @versionId = Version });
_versionDateInitialized = true;
@@ -260,7 +260,7 @@ namespace umbraco.cms.businesslogic
// Delete all data associated with this content
this.deleteAllProperties();
OnDeletedContent(new ContentDeleteEventArgs(Current.DatabaseContext.Database, Id));
OnDeletedContent(new ContentDeleteEventArgs(Current.DatabaseFactory.Database, Id));
// Delete version history
using (var sqlHelper = LegacySqlHelper.SqlHelper)

2
src/umbraco.cms/businesslogic/ContentType.cs
View File

@@ -1161,7 +1161,7 @@ namespace umbraco.cms.businesslogic
{
//NOTE Changed from "DocumentType.GetAllAsList().FindAll(dt => dt.MasterContentType == id)" to loading master contenttypes directly from the db.
//Related to http://issues.umbraco.org/issue/U4-1714
var dtos = Current.DatabaseContext.Database.Fetch<ContentType2ContentTypeDto>("WHERE parentContentTypeId = @Id", new { Id = id });
var dtos = Current.DatabaseFactory.Database.Fetch<ContentType2ContentTypeDto>("WHERE parentContentTypeId = @Id", new { Id = id });
foreach (var dto in dtos)
{
FlushFromCache(dto.ChildId);

2
src/umbraco.cms/businesslogic/language/Language.cs
View File

@@ -242,7 +242,7 @@ namespace umbraco.cms.businesslogic.language
/// </remarks>
public void Delete()
{
if (Current.DatabaseContext.Database.ExecuteScalar<int>("SELECT count(id) FROM umbracoDomains where domainDefaultLanguage = @id", new { id = id }) == 0)
if (Current.DatabaseFactory.Database.ExecuteScalar<int>("SELECT count(id) FROM umbracoDomains where domainDefaultLanguage = @id", new { id = id }) == 0)
{
Current.Services.LocalizationService.Delete(LanguageEntity);
}

2
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -157,7 +157,7 @@ namespace umbraco.cms.businesslogic.web
public static void RemoveTemplateFromDocument(int templateId)
{
Current.DatabaseContext.Database.Execute(
Current.DatabaseFactory.Database.Execute(
"update cmsDocument set templateId = NULL where templateId = @TemplateId", new {TemplateId = templateId});
//We need to clear cache for Documents since this is touching the database directly
Current.ApplicationCache.IsolatedRuntimeCache.ClearCache<IContent>();