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

Move constants

Browse Source
This commit is contained in:
Bjarke Berg
2019-11-05 13:45:42 +01:00
parent befcabfced
commit 63bfc4c2c0
324 changed files with 1710 additions and 1704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
View File

@@ -66,7 +66,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
public ContentNodeKit GetContentSource(IScope scope, int id)
{
var sql = ContentSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Document && x.NodeId == id && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && x.NodeId == id && !x.Trashed)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
@@ -76,7 +76,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
public IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope)
{
var sql = ContentSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Document && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
return scope.Database.Query<ContentSourceDto>(sql).Select(CreateContentNodeKit);
@@ -89,7 +89,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
.InnerJoin<NodeDto>("x").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.NodeId || SqlText<bool>(left.Path, right.Path, (lp, rp) => $"({lp} LIKE {syntax.GetConcat(rp, "',%'")})"), aliasRight: "x"))
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Document && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
.Where<NodeDto>(x => x.NodeId == id, "x")
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
@@ -101,7 +101,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
if (!ids.Any()) return Enumerable.Empty<ContentNodeKit>();
var sql = ContentSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Document && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
.WhereIn<ContentDto>(x => x.ContentTypeId, ids)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
@@ -139,7 +139,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
public ContentNodeKit GetMediaSource(IScope scope, int id)
{
var sql = MediaSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Media && x.NodeId == id && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && x.NodeId == id && !x.Trashed)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
@@ -149,7 +149,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
public IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope)
{
var sql = MediaSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Media && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
return scope.Database.Query<ContentSourceDto>(sql).Select(CreateMediaNodeKit);
@@ -162,7 +162,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
.InnerJoin<NodeDto>("x").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.NodeId || SqlText<bool>(left.Path, right.Path, (lp, rp) => $"({lp} LIKE {syntax.GetConcat(rp, "',%'")})"), aliasRight: "x"))
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Media && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
.Where<NodeDto>(x => x.NodeId == id, "x")
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
@@ -174,7 +174,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
if (!ids.Any()) return Enumerable.Empty<ContentNodeKit>();
var sql = MediaSourcesSelect(scope)
.Where<NodeDto>(x => x.NodeObjectType == ConstantsCore.ObjectTypes.Media && !x.Trashed)
.Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
.WhereIn<ContentDto>(x => x.ContentTypeId, ids)
.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);

12
src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
View File

@@ -1456,7 +1456,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
private void RebuildContentDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
{
var contentTypeIdsA = contentTypeIds?.ToArray();
var contentObjectType = ConstantsCore.ObjectTypes.Document;
var contentObjectType = Constants.ObjectTypes.Document;
var db = scope.Database;
// remove all - if anything fails the transaction will rollback
@@ -1528,7 +1528,7 @@ WHERE cmsContentNu.nodeId IN (
public void RebuildMediaDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
{
var contentTypeIdsA = contentTypeIds?.ToArray();
var mediaObjectType = ConstantsCore.ObjectTypes.Media;
var mediaObjectType = Constants.ObjectTypes.Media;
var db = scope.Database;
// remove all - if anything fails the transaction will rollback
@@ -1587,7 +1587,7 @@ WHERE cmsContentNu.nodeId IN (
public void RebuildMemberDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
{
var contentTypeIdsA = contentTypeIds?.ToArray();
var memberObjectType = ConstantsCore.ObjectTypes.Member;
var memberObjectType = Constants.ObjectTypes.Member;
var db = scope.Database;
// remove all - if anything fails the transaction will rollback
@@ -1648,7 +1648,7 @@ WHERE cmsContentNu.nodeId IN (
// every document should have a corresponding row for edited properties
// and if published, may have a corresponding row for published properties
var contentObjectType = ConstantsCore.ObjectTypes.Document;
var contentObjectType = Constants.ObjectTypes.Document;
var db = scope.Database;
var count = db.ExecuteScalar<int>($@"SELECT COUNT(*)
@@ -1679,7 +1679,7 @@ AND nuEdited.nodeId IS NULL OR ({Constants.DatabaseSchema.Tables.Document}.publi
{
// every media item should have a corresponding row for edited properties
var mediaObjectType = ConstantsCore.ObjectTypes.Media;
var mediaObjectType = Constants.ObjectTypes.Media;
var db = scope.Database;
var count = db.ExecuteScalar<int>(@"SELECT COUNT(*)
@@ -1708,7 +1708,7 @@ AND cmsContentNu.nodeId IS NULL
{
// every member item should have a corresponding row for edited properties
var memberObjectType = ConstantsCore.ObjectTypes.Member;
var memberObjectType = Constants.ObjectTypes.Member;
var db = scope.Database;
var count = db.ExecuteScalar<int>(@"SELECT COUNT(*)