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

Refactoring MediaTypeRepository to use strongly typed query for generating sql.

Browse Source
This commit is contained in:
Morten Christensen
2013-01-04 10:48:49 -01:00
parent 46fb8fca81
commit f534a671df
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
View File

@@ -104,10 +104,11 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("cmsContentType");
sql.InnerJoin("umbracoNode ON (cmsContentType.nodeId = umbracoNode.id)");
sql.Where("umbracoNode.nodeObjectType = @NodeObjectType", new { NodeObjectType = NodeObjectTypeId });
sql.Select(isCount ? "COUNT(*)" : "*")
.From<ContentTypeDto>()
.InnerJoin<NodeDto>()
.On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
return sql;
}
@@ -120,17 +121,17 @@ namespace Umbraco.Core.Persistence.Repositories
{
var list = new List<string>
{
string.Format("DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @Id"),
string.Format("DELETE FROM umbracoUser2NodePermission WHERE nodeId = @Id"),
string.Format("DELETE FROM cmsTagRelationship WHERE nodeId = @Id"),
string.Format("DELETE FROM cmsContentTypeAllowedContentType WHERE Id = @Id"),
string.Format("DELETE FROM cmsContentTypeAllowedContentType WHERE AllowedId = @Id"),
string.Format("DELETE FROM cmsContentType2ContentType WHERE parentContentTypeId = @Id"),
string.Format("DELETE FROM cmsContentType2ContentType WHERE childContentTypeId = @Id"),
string.Format("DELETE FROM cmsPropertyType WHERE contentTypeId = @Id"),
string.Format("DELETE FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @Id"),
string.Format("DELETE FROM cmsContentType WHERE NodeId = @Id"),
string.Format("DELETE FROM umbracoNode WHERE id = @Id")
"DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @Id",
"DELETE FROM umbracoUser2NodePermission WHERE nodeId = @Id",
"DELETE FROM cmsTagRelationship WHERE nodeId = @Id",
"DELETE FROM cmsContentTypeAllowedContentType WHERE Id = @Id",
"DELETE FROM cmsContentTypeAllowedContentType WHERE AllowedId = @Id",
"DELETE FROM cmsContentType2ContentType WHERE parentContentTypeId = @Id",
"DELETE FROM cmsContentType2ContentType WHERE childContentTypeId = @Id",
"DELETE FROM cmsPropertyType WHERE contentTypeId = @Id",
"DELETE FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @Id",
"DELETE FROM cmsContentType WHERE NodeId = @Id",
"DELETE FROM umbracoNode WHERE id = @Id"
};
return list;
}

21
src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
View File

@@ -1,5 +1,7 @@
using System;
using NUnit.Framework;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Tests.TestHelpers;
namespace Umbraco.Tests.Persistence.Querying
@@ -10,7 +12,24 @@ namespace Umbraco.Tests.Persistence.Querying
[Test]
public void Can_Verify_Base_Clause()
{
var NodeObjectTypeId = new Guid("");
var NodeObjectTypeId = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e");
var expected = new Sql();
expected.Select("*")
.From("[cmsContentType]")
.InnerJoin("[umbracoNode]").On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
.Where("[umbracoNode].[nodeObjectType] = '4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e'");
var sql = new Sql();
sql.Select("*")
.From<ContentTypeDto>()
.InnerJoin<NodeDto>()
.On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
Console.WriteLine(sql.SQL);
}
}
}