From ad36595b9642473101855ea00a284fb883ef0464 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 4 Jan 2013 11:01:20 -0100 Subject: [PATCH] Refactoring remaining repositories using the standard sql builder to use stronly typed queries for generating sql. This completes U4-1224 --- .../Repositories/DictionaryRepository.cs | 11 ++++++----- .../Repositories/LanguageRepository.cs | 6 +++--- .../Repositories/RelationRepository.cs | 7 +++---- .../Repositories/RelationTypeRepository.cs | 8 ++++---- .../Repositories/TemplateRepository.cs | 19 ++++++++++--------- .../Repositories/UserRepository.cs | 6 +++--- .../Repositories/UserTypeRepository.cs | 8 ++++---- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs index 499b79c918..a69fe73149 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs @@ -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(); } else { - sql.Select("*"); - sql.From("cmsDictionary"); - sql.InnerJoin("cmsLanguageText ON (cmsDictionary.id = cmsLanguageText.UniqueId)"); + sql.Select("*") + .From() + .InnerJoin() + .On(left => left.UniqueId, right => right.UniqueId); } return sql; } diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs index 77448817be..1617cffc39 100644 --- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs @@ -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(); 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.Format("DELETE FROM umbracoLanguage WHERE id = @Id") + "DELETE FROM umbracoLanguage WHERE id = @Id" }; return list; } diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs index 3b2d8e753f..02839e78e4 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs @@ -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(); return sql; } @@ -107,7 +106,7 @@ namespace Umbraco.Core.Persistence.Repositories { var list = new List { - string.Format("DELETE FROM umbracoRelation WHERE id = @Id") + "DELETE FROM umbracoRelation WHERE id = @Id" }; return list; } diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs index bebfb7311b..be5a4ade57 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs @@ -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(); return sql; } @@ -98,8 +98,8 @@ namespace Umbraco.Core.Persistence.Repositories { var list = new List { - 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; } diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs index 88565f29e9..0433418435 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs @@ -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() + .InnerJoin() + .On(left => left.NodeId, right => right.NodeId) + .Where(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.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; } diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs index 383394ae60..a42c626027 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs @@ -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(); return sql; } @@ -102,7 +102,7 @@ namespace Umbraco.Core.Persistence.Repositories { var list = new List { - string.Format("DELETE FROM umbracoUser WHERE id = @Id") + "DELETE FROM umbracoUser WHERE id = @Id" }; return list; } diff --git a/src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs index 98e3fc4e7e..7d459eb2b2 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs @@ -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(); return sql; } @@ -97,8 +97,8 @@ namespace Umbraco.Core.Persistence.Repositories { var list = new List { - 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; }