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

Completes: U4-6104 Remove SqlSyntaxContext - quite a large refactor and cleanup since the SqlSyntaxContext was used everywhere :( haven't run tests, etc... yet but the project builds now.

Browse Source
This commit is contained in:
Shannon
2015-02-22 21:36:02 +01:00
parent 693384bdf6
commit 905e58e3b6
261 changed files with 2004 additions and 3669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/WebServices/XmlDataIntegrityController.cs
View File

@@ -38,9 +38,9 @@ namespace Umbraco.Web.WebServices
var subQuery = new Sql()
.Select("DISTINCT cmsContentXml.nodeId")
.From<ContentXmlDto>()
.InnerJoin<DocumentDto>()
.On<DocumentDto, ContentXmlDto>(left => left.NodeId, right => right.NodeId);
.From<ContentXmlDto>(DatabaseContext.SqlSyntax)
.InnerJoin<DocumentDto>(DatabaseContext.SqlSyntax)
.On<DocumentDto, ContentXmlDto>(DatabaseContext.SqlSyntax, left => left.NodeId, right => right.NodeId);
var totalXml = ApplicationContext.DatabaseContext.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM (" + subQuery.SQL + ") as tmp");
@@ -54,10 +54,10 @@ namespace Umbraco.Web.WebServices
var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media);
var subQuery = new Sql()
.Select("Count(*)")
.From<ContentXmlDto>()
.InnerJoin<NodeDto>()
.On<ContentXmlDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType);
.From<ContentXmlDto>(DatabaseContext.SqlSyntax)
.InnerJoin<NodeDto>(DatabaseContext.SqlSyntax)
.On<ContentXmlDto, NodeDto>(DatabaseContext.SqlSyntax, left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(DatabaseContext.SqlSyntax, dto => dto.NodeObjectType == mediaObjectType);
var totalXml = ApplicationContext.DatabaseContext.Database.ExecuteScalar<int>(subQuery);
return totalXml == total;
@@ -70,10 +70,10 @@ namespace Umbraco.Web.WebServices
var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member);
var subQuery = new Sql()
.Select("Count(*)")
.From<ContentXmlDto>()
.InnerJoin<NodeDto>()
.On<ContentXmlDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(dto => dto.NodeObjectType == memberObjectType);
.From<ContentXmlDto>(DatabaseContext.SqlSyntax)
.InnerJoin<NodeDto>(DatabaseContext.SqlSyntax)
.On<ContentXmlDto, NodeDto>(DatabaseContext.SqlSyntax, left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(DatabaseContext.SqlSyntax, dto => dto.NodeObjectType == memberObjectType);
var totalXml = ApplicationContext.DatabaseContext.Database.ExecuteScalar<int>(subQuery);
return totalXml == total;