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

Refactoring remaining repositories using the standard sql builder to use stronly typed queries for generating sql.

Browse Source 
This completes U4-1224
This commit is contained in:
Morten Christensen
2013-01-04 11:01:20 -01:00
parent f534a671df
commit ad36595b96
7 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
View File

@@ -101,14 +101,15 @@ namespace Umbraco.Core.Persistence.Repositories
var sql = new Sql();
if(isCount)
{
sql.Select("COUNT(*)");
sql.From("cmsDictionary");
sql.Select("COUNT(*)")
.From<DictionaryDto>();
}
else
{
sql.Select("*");
sql.From("cmsDictionary");
sql.InnerJoin("cmsLanguageText ON (cmsDictionary.id = cmsLanguageText.UniqueId)");
sql.Select("*")
.From<DictionaryDto>()
.InnerJoin<LanguageTextDto>()
.On<DictionaryDto, LanguageTextDto>(left => left.UniqueId, right => right.UniqueId);
}
return sql;
}

6
src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
View File

@@ -85,8 +85,8 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("umbracoLanguage");
sql.Select(isCount ? "COUNT(*)" : "*")
.From<LanguageDto>();
return sql;
}
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Repositories
//NOTE: There is no constraint between the Language and cmsDictionary/cmsLanguageText tables (?)
var list = new List<string>
{
string.Format("DELETE FROM umbracoLanguage WHERE id = @Id")
"DELETE FROM umbracoLanguage WHERE id = @Id"
};
return list;
}

7
src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence.Caching;
using Umbraco.Core.Persistence.Factories;
@@ -93,8 +92,8 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("umbracoRelation");
sql.Select(isCount ? "COUNT(*)" : "*")
.From<RelationDto>();
return sql;
}
@@ -107,7 +106,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
var list = new List<string>
{
string.Format("DELETE FROM umbracoRelation WHERE id = @Id")
"DELETE FROM umbracoRelation WHERE id = @Id"
};
return list;
}

8
src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs
View File

@@ -84,8 +84,8 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("umbracoRelationType");
sql.Select(isCount ? "COUNT(*)" : "*")
.From<RelationTypeDto>();
return sql;
}
@@ -98,8 +98,8 @@ namespace Umbraco.Core.Persistence.Repositories
{
var list = new List<string>
{
string.Format("DELETE FROM umbracoRelation WHERE relType = @Id"),
string.Format("DELETE FROM umbracoRelationType WHERE id = @Id")
"DELETE FROM umbracoRelation WHERE relType = @Id",
"DELETE FROM umbracoRelationType WHERE id = @Id"
};
return list;
}

19
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
View File

@@ -130,10 +130,11 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("cmsTemplate");
sql.InnerJoin("umbracoNode").On("cmsTemplate.nodeId = umbracoNode.id");
sql.Where("umbracoNode.nodeObjectType = @NodeObjectType", new { NodeObjectType = NodeObjectTypeId });
sql.Select(isCount ? "COUNT(*)" : "*")
.From<TemplateDto>()
.InnerJoin<NodeDto>()
.On<TemplateDto, NodeDto>(left => left.NodeId, right => right.NodeId)
.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
return sql;
}
@@ -147,11 +148,11 @@ namespace Umbraco.Core.Persistence.Repositories
//TODO check for references in DocumentDto and remove value (nullable)
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 cmsDocumentType WHERE templateNodeId = @Id"),
string.Format("DELETE FROM cmsTemplate 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 cmsDocumentType WHERE templateNodeId = @Id",
"DELETE FROM cmsTemplate WHERE nodeId = @Id",
"DELETE FROM umbracoNode WHERE id = @Id"
};
return list;
}

6
src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
View File

@@ -88,8 +88,8 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("umbracoUser");
sql.Select(isCount ? "COUNT(*)" : "*")
.From<UserDto>();
return sql;
}
@@ -102,7 +102,7 @@ namespace Umbraco.Core.Persistence.Repositories
{
var list = new List<string>
{
string.Format("DELETE FROM umbracoUser WHERE id = @Id")
"DELETE FROM umbracoUser WHERE id = @Id"
};
return list;
}

8
src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
View File

@@ -83,8 +83,8 @@ namespace Umbraco.Core.Persistence.Repositories
protected override Sql GetBaseQuery(bool isCount)
{
var sql = new Sql();
sql.Select(isCount ? "COUNT(*)" : "*");
sql.From("umbracoUserType");
sql.Select(isCount ? "COUNT(*)" : "*")
.From<UserTypeDto>();
return sql;
}
@@ -97,8 +97,8 @@ namespace Umbraco.Core.Persistence.Repositories
{
var list = new List<string>
{
string.Format("DELETE FROM umbracoUser WHERE userType = @Id"),
string.Format("DELETE FROM umbracoUserType WHERE id = @Id")
"DELETE FROM umbracoUser WHERE userType = @Id",
"DELETE FROM umbracoUserType WHERE id = @Id"
};
return list;
}