diff --git a/src/Umbraco.Core/Models/Rdbms/ContentDto.cs b/src/Umbraco.Core/Models/Rdbms/ContentDto.cs index 7408093020..361b61cb42 100644 --- a/src/Umbraco.Core/Models/Rdbms/ContentDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/ContentDto.cs @@ -3,21 +3,23 @@ using Umbraco.Core.Persistence.DatabaseAnnotations; namespace Umbraco.Core.Models.Rdbms { - [TableName(Constants.DatabaseSchema.Tables.Content)] - [PrimaryKey("pk")] + [TableName(TableName)] + [PrimaryKey("id")] [ExplicitColumns] internal class ContentDto { - [Column("pk")] + private const string TableName = Constants.DatabaseSchema.Tables.Content; + + [Column("id")] [PrimaryKeyColumn] - public int PrimaryKey { get; set; } + public int Id { get; set; } [Column("nodeId")] [ForeignKey(typeof(NodeDto))] - [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsContent")] + [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName + "_NodeId")] public int NodeId { get; set; } - [Column("contentType")] + [Column("contentTypeId")] [ForeignKey(typeof(ContentTypeDto), Column = "nodeId")] public int ContentTypeId { get; set; } diff --git a/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs b/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs index 06f4f7d65c..80be40b2a7 100644 --- a/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs @@ -5,28 +5,34 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { - [TableName(Constants.DatabaseSchema.Tables.ContentVersion)] + [TableName(TableName)] [PrimaryKey("id")] [ExplicitColumns] internal class ContentVersionDto { + private const string TableName = Constants.DatabaseSchema.Tables.ContentVersion; + [Column("id")] [PrimaryKeyColumn] public int Id { get; set; } - [Column("ContentId")] + [Column("nodeId")] [ForeignKey(typeof(ContentDto), Column = "nodeId")] - [Index(IndexTypes.NonClustered, Name = "IX_cmsContentVersion_ContentId")] + [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId")] public int NodeId { get; set; } - [Column("VersionId")] + [Column("versionId")] [Index(IndexTypes.UniqueNonClustered)] public Guid VersionId { get; set; } - [Column("VersionDate")] + [Column("versionDate")] [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime VersionDate { get; set; } + [Column("text")] + [NullSetting(NullSetting = NullSettings.Null)] + public string Text { get; set; } + [ResultColumn] [Reference(ReferenceType.OneToOne, ColumnName = "NodeId", ReferenceMemberName = "NodeId")] public ContentDto ContentDto { get; set; } diff --git a/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs b/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs index 7d5161eb9c..46e9da8280 100644 --- a/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs @@ -5,21 +5,24 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { - [TableName(Constants.DatabaseSchema.Tables.Document)] + [TableName(TableName)] [PrimaryKey("versionId", AutoIncrement = false)] [ExplicitColumns] internal class DocumentDto { + private const string TableName = Constants.DatabaseSchema.Tables.Document; + [Column("nodeId")] [ForeignKey(typeof(ContentDto), Column = "nodeId")] [ForeignKey(typeof(NodeDto))] - [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsDocument", ForColumns = "nodeId, versionId")] + [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId, versionId")] public int NodeId { get; set; } [Column("published")] - [Index(IndexTypes.NonClustered, Name = "IX_cmsDocument_published")] + [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Published")] public bool Published { get; set; } + // fixme writerUserId [Column("documentUser")] public int WriterUserId { get; set; } @@ -47,6 +50,7 @@ namespace Umbraco.Core.Models.Rdbms [ForeignKey(typeof(TemplateDto), Column = "nodeId")] public int? TemplateId { get; set; } + // fixme kill that one [Column("newest")] [Constraint(Default = "0")] [Index(IndexTypes.NonClustered, Name = "IX_cmsDocument_newest")] @@ -56,6 +60,7 @@ namespace Umbraco.Core.Models.Rdbms [Reference(ReferenceType.OneToOne, ReferenceMemberName = "NodeId")] public ContentVersionDto ContentVersionDto { get; set; } + // fixme wtf [ResultColumn] [Reference(ReferenceType.OneToOne, ReferenceMemberName = "NodeId")] public DocumentPublishedReadOnlyDto DocumentPublishedReadOnlyDto { get; set; } diff --git a/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs b/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs index 2ab13d5a55..c49a8ab62d 100644 --- a/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs @@ -46,6 +46,10 @@ namespace Umbraco.Core.Models.Rdbms [Length(SegmentLength)] public string Segment { get; set; } + [Column("published")] + [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Published")] + public bool Published { get; set; } + [Column("intValue")] [NullSetting(NullSetting = NullSettings.Null)] public int? IntegerValue { get; set; } diff --git a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs index 042652d6ed..e07441959a 100644 --- a/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs +++ b/src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs @@ -25,9 +25,9 @@ namespace Umbraco.Core public const string DataTypePreValue = /*TableNamePrefix*/ "cms" + "DataTypePreValues"; // fixme dbfixkill merge with uDataType public const string Template = /*TableNamePrefix*/ "cms" + "Template"; - public const string Content = /*TableNamePrefix*/ "cms" + "Content"; // fixme dbfix merge into uDocument - public const string ContentVersion = /*TableNamePrefix*/ "cms" + "ContentVersion"; // fixme dbfix rename uDocumentVersion - public const string Document = /*TableNamePrefix*/ "cms" + "Document"; // fixme dbfix merge with others + no more version here + public const string Content = TableNamePrefix + "Content"; + public const string ContentVersion = TableNamePrefix + "ContentVersion"; + public const string Document = TableNamePrefix + "Document"; public const string PropertyType = /*TableNamePrefix*/ "cms" + "PropertyType"; public const string PropertyTypeGroup = /*TableNamePrefix*/ "cms" + "PropertyTypeGroup"; diff --git a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs index dd925656bc..1597021a1d 100644 --- a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs @@ -156,7 +156,7 @@ namespace Umbraco.Core.Persistence.Factories if (_primaryKey > 0) { - contentDto.PrimaryKey = _primaryKey; + contentDto.Id = _primaryKey; } return contentDto; diff --git a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs index 74254dcc8c..1f1749ed91 100644 --- a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs @@ -94,7 +94,7 @@ namespace Umbraco.Core.Persistence.Factories if (_primaryKey > 0) { - contentDto.PrimaryKey = _primaryKey; + contentDto.Id = _primaryKey; } return contentDto; diff --git a/src/Umbraco.Core/Persistence/Factories/MemberFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberFactory.cs index 2dbfa7ac51..3f47137c74 100644 --- a/src/Umbraco.Core/Persistence/Factories/MemberFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MemberFactory.cs @@ -105,7 +105,7 @@ namespace Umbraco.Core.Persistence.Factories if (_primaryKey > 0) { - contentDto.PrimaryKey = _primaryKey; + contentDto.Id = _primaryKey; } return contentDto; diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs index 35bf0dcbc0..b7d5314a29 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs @@ -119,9 +119,9 @@ namespace Umbraco.Core.Persistence.Migrations.Initial } } - //if the error indicates a problem with the constraint FK_cmsContent_cmsContentType_nodeId then it is not version 7.2 + //if the error indicates a problem with the constraint FK_cms-OBSOLETE-Content_cmsContentType_nodeId then it is not version 7.2 // since this gets added in 7.2.0 so it must be the previous version - if (Errors.Any(x => x.Item1.Equals("Constraint") && (x.Item2.InvariantEquals("FK_cmsContent_cmsContentType_nodeId")))) + if (Errors.Any(x => x.Item1.Equals("Constraint") && (x.Item2.InvariantEquals("FK_cms-OBSOLETE-Content_cmsContentType_nodeId")))) { return new Version(7, 0, 0); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddContentNuTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddContentNuTable.cs index 9dadaa726b..949ba504e9 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddContentNuTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddContentNuTable.cs @@ -1,6 +1,5 @@ using System.Data; using System.Linq; -using Umbraco.Core.Configuration; using Umbraco.Core.Persistence.DatabaseAnnotations; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/VariantsMigration.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/VariantsMigration.cs index 97c282d6ae..0b99f06e28 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/VariantsMigration.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/VariantsMigration.cs @@ -3,8 +3,6 @@ using System.Linq; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Initial; -using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column; -using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table; using Umbraco.Core.Persistence.Migrations.Syntax.Execute; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight @@ -23,6 +21,9 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight Execute.DropKeysAndIndexes(); MigratePropertyData(); + MigrateContent(); + MigrateContentVersion(); + MigrateDocument(); // re-create *all* keys and indexes //Create.KeysAndIndexes(); @@ -30,6 +31,52 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight Create.KeysAndIndexes(x.Value); } + private void MigrateContent() + { + // if the table has already been renamed, we're done + if (TableExists(Constants.DatabaseSchema.Tables.Content)) + return; + + // migrate + if (ColumnExists(PreTables.Content, "contentType")) + ReplaceColumn(PreTables.Content, "contentType", "contentTypeId"); + if (ColumnExists(PreTables.Content, "pk")) + ReplaceColumn(PreTables.Content, "pk", "id"); + Rename.Table(PreTables.Content).To(Constants.DatabaseSchema.Tables.Content); + } + + private void MigrateContentVersion() + { + // if the table has already been renamed, we're done + if (TableExists(Constants.DatabaseSchema.Tables.ContentVersion)) + return; + + // migrate + if (!ColumnExists(PreTables.ContentVersion, "text")) + AddColumn(PreTables.ContentVersion, "text"); + if (ColumnExists(PreTables.ContentVersion, "ContentId")) + ReplaceColumn(PreTables.Content, "ContentId", "nodeId"); + Rename.Table(PreTables.ContentVersion).To(Constants.DatabaseSchema.Tables.ContentVersion); + } + + private void MigrateDocument() + { + // if the table has already been renamed, we're done + if (TableExists(Constants.DatabaseSchema.Tables.Document)) + return; + + // migrate + // todo! + // - rename nodeId + // - rename documentUser + // - only keep newest but update other versions with text? + // - document text vs node text? + // - we need uDocumentVersion FIRST not to lose templateId! + // - kill newest + + Rename.Table(PreTables.Document).To(Constants.DatabaseSchema.Tables.Document); + } + private void MigratePropertyData() { // if the table has already been renamed, we're done @@ -37,12 +84,14 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight return; // add column propertyData.languageId + // add column propertyData.segment + // add column propertyData.published if (!ColumnExists(PreTables.PropertyData, "languageId")) AddColumn(PreTables.PropertyData, "languageId"); - - // add column propertyData.segment if (!ColumnExists(PreTables.PropertyData, "segment")) AddColumn(PreTables.PropertyData, "segment"); + if (!ColumnExists(PreTables.PropertyData, "published")) + AddColumn(PreTables.PropertyData, "published"); // do NOT use Rename.Column as it's borked on SQLCE - use ReplaceColumn instead diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index 9dd350cfe1..d22c5ffa4a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -198,7 +198,7 @@ namespace Umbraco.Core.Persistence.Repositories "DELETE FROM cmsPreviewXml WHERE nodeId = @Id", "DELETE FROM cmsContentVersion WHERE ContentId = @Id", "DELETE FROM cmsContentXml WHERE nodeId = @Id", - "DELETE FROM cmsContent WHERE nodeId = @Id", + "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @Id", "DELETE FROM umbracoAccess WHERE nodeId = @Id", "DELETE FROM umbracoNode WHERE id = @Id" }; @@ -467,7 +467,7 @@ namespace Umbraco.Core.Persistence.Repositories var factory = new ContentFactory(NodeObjectTypeId, entity.Id); //Look up Content entry to get Primary for updating the DTO var contentDto = Database.SingleOrDefault("WHERE nodeId = @Id", new { /*Id =*/ entity.Id }); - factory.SetPrimaryKey(contentDto.PrimaryKey); + factory.SetPrimaryKey(contentDto.Id); var dto = factory.BuildDto(entity); //Updates the (base) node data - umbracoNode diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs index d92dc7c874..1ffde67f1f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs @@ -1238,8 +1238,8 @@ WHERE cmsContentType." + aliasColumn + @" LIKE @pattern", { var ids = contentPath.Split(',').Select(int.Parse); var sql = new Sql(@"SELECT COUNT(*) FROM cmsContentType -INNER JOIN cmsContent ON cmsContentType.nodeId=cmsContent.contentType -WHERE cmsContent.nodeId IN (@ids) AND cmsContentType.isContainer=@isContainer", new { ids, isContainer = true }); +INNER JOIN uContent ON cmsContentType.nodeId=uContent.contentTypeId +WHERE uContent.nodeId IN (@ids) AND cmsContentType.isContainer=@isContainer", new { ids, isContainer = true }); return Database.ExecuteScalar(sql) > 0; } diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs index 9571338263..7a557c1434 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs @@ -93,7 +93,7 @@ namespace Umbraco.Core.Persistence.Repositories if (entity.RootContentId.HasValue) { - var contentExists = Database.ExecuteScalar("SELECT COUNT(*) FROM cmsContent WHERE nodeId = @id", new { id = entity.RootContentId.Value }); + var contentExists = Database.ExecuteScalar("SELECT COUNT(*) FROM uContent WHERE nodeId = @id", new { id = entity.RootContentId.Value }); if (contentExists == 0) throw new NullReferenceException("No content exists with id " + entity.RootContentId.Value); } @@ -131,7 +131,7 @@ namespace Umbraco.Core.Persistence.Repositories if (entity.RootContentId.HasValue) { - var contentExists = Database.ExecuteScalar("SELECT COUNT(*) FROM cmsContent WHERE nodeId = @id", new { id = entity.RootContentId.Value }); + var contentExists = Database.ExecuteScalar("SELECT COUNT(*) FROM uContent WHERE nodeId = @id", new { id = entity.RootContentId.Value }); if (contentExists == 0) throw new NullReferenceException("No content exists with id " + entity.RootContentId.Value); } diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs index 75a32a448e..b8292f6e9d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs @@ -510,7 +510,7 @@ namespace Umbraco.Core.Persistence.Repositories if (isContent || isMedia) { entitySql - .InnerJoin("cmsContent content").On("content.nodeId = umbracoNode.id"); + .InnerJoin("uContent content").On("content.nodeId = umbracoNode.id"); } if (isContent) diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index d6bb549f6f..cc5c1444e7 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -138,7 +138,7 @@ namespace Umbraco.Core.Persistence.Repositories "DELETE FROM cmsDocument WHERE nodeId = @Id", "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE nodeId = @Id", "DELETE FROM cmsContentVersion WHERE ContentId = @Id", - "DELETE FROM cmsContent WHERE nodeId = @Id", + "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @Id", "DELETE FROM umbracoNode WHERE id = @Id" }; return list; @@ -344,7 +344,7 @@ namespace Umbraco.Core.Persistence.Repositories var factory = new MediaFactory(NodeObjectTypeId, entity.Id); //Look up Content entry to get Primary for updating the DTO var contentDto = Database.SingleOrDefault("WHERE nodeId = @Id", new { /*Id =*/ entity.Id }); - factory.SetPrimaryKey(contentDto.PrimaryKey); + factory.SetPrimaryKey(contentDto.Id); var dto = factory.BuildDto(entity); //Updates the (base) node data - umbracoNode diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 8acaa8e2fd..a51e8eb174 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -180,7 +180,7 @@ namespace Umbraco.Core.Persistence.Repositories "DELETE FROM cmsMember WHERE nodeId = @Id", "DELETE FROM cmsContentVersion WHERE ContentId = @Id", "DELETE FROM cmsContentXml WHERE nodeId = @Id", - "DELETE FROM cmsContent WHERE nodeId = @Id", + "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @Id", "DELETE FROM umbracoNode WHERE id = @Id" }; return list; @@ -309,7 +309,7 @@ namespace Umbraco.Core.Persistence.Repositories var factory = new MemberFactory(NodeObjectTypeId, entity.Id); //Look up Content entry to get Primary for updating the DTO var contentDto = Database.SingleOrDefault("WHERE nodeId = @Id", new { /*Id =*/ entity.Id }); - factory.SetPrimaryKey(contentDto.PrimaryKey); + factory.SetPrimaryKey(contentDto.Id); var dto = factory.BuildDto(entity); //Updates the (base) node data - umbracoNode diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 29859f6dc7..3e198a6d5c 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs @@ -710,7 +710,7 @@ WHERE EXISTS( INNER JOIN cmsPropertyType ON b.datatypeNodeId = cmsPropertyType.dataTypeId INNER JOIN - (" + string.Format(parsedOriginalSql, "cmsContent.contentType") + @") as docData + (" + string.Format(parsedOriginalSql, "uContent.contentTypeId") + @") as docData ON cmsPropertyType.contentTypeId = docData.contentType WHERE a.id = b.id)", docSql.Arguments); @@ -730,7 +730,7 @@ FROM " + Constants.DatabaseSchema.Tables.PropertyData + " INNER JOIN cmsPropertyType ON " + Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid = cmsPropertyType.id INNER JOIN - (" + string.Format(parsedOriginalSql, "cmsContent.nodeId, cmsContentVersion.VersionId") + @") as docData + (" + string.Format(parsedOriginalSql, "uContent.nodeId, cmsContentVersion.VersionId") + @") as docData ON " + Constants.DatabaseSchema.Tables.PropertyData + ".versionId = docData.VersionId AND " + Constants.DatabaseSchema.Tables.PropertyData + ".nodeId = docData.nodeId ORDER BY nodeId, versionId, propertytypeid ", docSql.Arguments); diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs index b43a0246b4..1d7e08f428 100644 --- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs +++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs @@ -178,7 +178,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests public void Can_Select_From_With_Type() { var expected = Sql(); - expected.SelectAll().From("[cmsContent]"); + expected.SelectAll().From("[uContent]"); var sql = Sql(); sql.SelectAll().From(); @@ -211,7 +211,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests public void Can_OrderBy_With_Type() { var expected = Sql(); - expected.SelectAll().From("[cmsContent]").OrderBy("([cmsContent].[contentType])"); + expected.SelectAll().From("[uContent]").OrderBy("([uContent].[contentTypeId])"); var sql = Sql(); sql.SelectAll().From().OrderBy(x => x.ContentTypeId); @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests public void Can_GroupBy_With_Type() { var expected = Sql(); - expected.SelectAll().From("[cmsContent]").GroupBy("[cmsContent].[contentType]"); + expected.SelectAll().From("[uContent]").GroupBy("[uContent].[contentTypeId]"); var sql = Sql(); sql.SelectAll().From().GroupBy(x => x.ContentTypeId); @@ -239,7 +239,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests public void Can_Use_Where_Predicate() { var expected = Sql(); - expected.SelectAll().From("[cmsContent]").Where("([cmsContent].[nodeId] = @0)", 1045); + expected.SelectAll().From("[uContent]").Where("([uContent].[nodeId] = @0)", 1045); var sql = Sql(); sql.SelectAll().From().Where(x => x.NodeId == 1045); @@ -254,9 +254,9 @@ namespace Umbraco.Tests.Persistence.NPocoTests { var expected = Sql(); expected.SelectAll() - .From("[cmsContent]") - .Where("([cmsContent].[nodeId] = @0)", 1045) - .Where("([cmsContent].[contentType] = @0)", 1050); + .From("[uContent]") + .Where("([uContent].[nodeId] = @0)", 1045) + .Where("([uContent].[contentTypeId] = @0)", 1050); var sql = Sql(); sql.SelectAll() diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs index cfe2053801..5aae245ff2 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs @@ -21,8 +21,8 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*") .From("[cmsDocument]") .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]") - .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]") - .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]") + .InnerJoin("[uContent]").On("[cmsContentVersion].[ContentId] = [uContent].[nodeId]") + .InnerJoin("[umbracoNode]").On("[uContent].[nodeId] = [umbracoNode].[id]") .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972")); var sql = Sql(); @@ -56,8 +56,8 @@ namespace Umbraco.Tests.Persistence.Querying expected.SelectAll() .From("[cmsDocument]") .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]") - .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]") - .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]") + .InnerJoin("[uContent]").On("[cmsContentVersion].[ContentId] = [uContent].[nodeId]") + .InnerJoin("[umbracoNode]").On("[uContent].[nodeId] = [umbracoNode].[id]") .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972")) .Where("([umbracoNode].[id] = @0)", 1050); @@ -94,8 +94,8 @@ namespace Umbraco.Tests.Persistence.Querying expected.Select("*") .From("[cmsDocument]") .InnerJoin("[cmsContentVersion]").On("[cmsDocument].[versionId] = [cmsContentVersion].[VersionId]") - .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]") - .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]") + .InnerJoin("[uContent]").On("[cmsContentVersion].[ContentId] = [uContent].[nodeId]") + .InnerJoin("[umbracoNode]").On("[uContent].[nodeId] = [umbracoNode].[id]") .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972")) .Where("([umbracoNode].[id] = @0)", 1050) .Where("([cmsContentVersion].[VersionId] = @0)", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07")) diff --git a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs index 4637a73878..23d3445cf4 100644 --- a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs @@ -20,8 +20,8 @@ namespace Umbraco.Tests.Persistence.Querying var expected = new Sql(); expected.Select("*") .From("[cmsContentVersion]") - .InnerJoin("[cmsContent]").On("[cmsContentVersion].[ContentId] = [cmsContent].[nodeId]") - .InnerJoin("[umbracoNode]").On("[cmsContent].[nodeId] = [umbracoNode].[id]") + .InnerJoin("[uContent]").On("[cmsContentVersion].[ContentId] = [uContent].[nodeId]") + .InnerJoin("[umbracoNode]").On("[uContent].[nodeId] = [umbracoNode].[id]") .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c")); var sql = Sql(); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 110ee0e61b..a2530cdd4d 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -324,7 +324,7 @@ namespace Umbraco.Tests.Persistence.Repositories } var sql = provider.SqlContext.Sql(); - sql.Select("umbracoNode.*", "cmsContent.contentType", "cmsContentType.alias AS ContentTypeAlias", "cmsContentVersion.VersionId", + sql.Select("umbracoNode.*", "uContent.contentTypeId", "cmsContentType.alias AS ContentTypeAlias", "cmsContentVersion.VersionId", "cmsContentVersion.VersionDate", "cmsMember.Email", "cmsMember.LoginName", "cmsMember.Password", Constants.DatabaseSchema.Tables.PropertyData + ".id AS PropertyDataId", Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid", diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs index 7c5412a080..186741f4ef 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs @@ -18,7 +18,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource { var dto = uow.Database.Fetch(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, docDraft.text DraftName, docDraft.versionId DraftVersion, docDraft.updateDate DraftVersionDate, docDraft.documentUser DraftWriterId, docDraft.templateId DraftTemplateId, @@ -26,7 +26,7 @@ nuDraft.data DraftData, docPub.text PubName, docPub.versionId PubVersion, docPub.updateDate PubVersionDate, docPub.documentUser PubWriterId, docPub.templateId PubTemplateId, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) LEFT JOIN cmsDocument docDraft ON (docDraft.nodeId=n.id AND docDraft.newest=1 AND docDraft.published=0) LEFT JOIN cmsDocument docPub ON (docPub.nodeId=n.id AND docPub.published=1) LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) @@ -42,13 +42,13 @@ WHERE n.nodeObjectType=@objType AND n.id=@id var dto = uow.Database.Fetch(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, n.text PubName, ver.versionId PubVersion, ver.versionDate PubVersionDate, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND n.id=@id @@ -62,7 +62,7 @@ WHERE n.nodeObjectType=@objType AND n.id=@id { return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, docDraft.text DraftName, docDraft.versionId DraftVersion, docDraft.updateDate DraftVersionDate, docDraft.documentUser DraftWriterId, docDraft.templateId DraftTemplateId, @@ -70,7 +70,7 @@ nuDraft.data DraftData, docPub.text PubName, docPub.versionId PubVersion, docPub.updateDate PubVersionDate, docPub.documentUser PubWriterId, docPub.templateId PubTemplateId, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) LEFT JOIN cmsDocument docDraft ON (docDraft.nodeId=n.id AND docDraft.newest=1 AND docDraft.published=0) LEFT JOIN cmsDocument docPub ON (docPub.nodeId=n.id AND docPub.published=1) LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) @@ -86,13 +86,13 @@ ORDER BY n.level, n.sortOrder return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, n.text PubName, ver.versionId PubVersion, ver.versionDate PubVersionDate, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType @@ -104,7 +104,7 @@ ORDER BY n.level, n.sortOrder { return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, docDraft.text DraftName, docDraft.versionId DraftVersion, docDraft.updateDate DraftVersionDate, docDraft.documentUser DraftWriterId, docDraft.templateId DraftTemplateId, @@ -113,7 +113,7 @@ docPub.text PubName, docPub.versionId PubVersion, docPub.updateDate PubVersionDa nuPub.data PubData FROM umbracoNode n JOIN umbracoNode x ON (n.id=x.id OR n.path LIKE " + uow.SqlContext.SqlSyntax.GetConcat("x.path", "',%'") + @") -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) LEFT JOIN cmsDocument docDraft ON (docDraft.nodeId=n.id AND docDraft.newest=1 AND docDraft.published=0) LEFT JOIN cmsDocument docPub ON (docPub.nodeId=n.id AND docPub.published=1) LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) @@ -129,14 +129,14 @@ ORDER BY n.level, n.sortOrder return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, n.text PubName, ver.versionId PubVersion, ver.versionDate PubVersionDate, nuPub.data PubData FROM umbracoNode n JOIN umbracoNode x ON (n.id=x.id OR n.path LIKE " + uow.SqlContext.SqlSyntax.GetConcat("x.path", "',%'") + @") -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND x.id=@id @@ -148,7 +148,7 @@ ORDER BY n.level, n.sortOrder { return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, docDraft.text DraftName, docDraft.versionId DraftVersion, docDraft.updateDate DraftVersionDate, docDraft.documentUser DraftWriterId, docDraft.templateId DraftTemplateId, @@ -156,12 +156,12 @@ nuDraft.data DraftData, docPub.text PubName, docPub.versionId PubVersion, docPub.updateDate PubVersionDate, docPub.documentUser PubWriterId, docPub.templateId PubTemplateId, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) LEFT JOIN cmsDocument docDraft ON (docDraft.nodeId=n.id AND docDraft.newest=1 AND docDraft.published=0) LEFT JOIN cmsDocument docPub ON (docPub.nodeId=n.id AND docPub.published=1) LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) -WHERE n.nodeObjectType=@objType AND cmsContent.contentType IN (@ids) +WHERE n.nodeObjectType=@objType AND uContent.contentTypeId IN (@ids) ORDER BY n.level, n.sortOrder ", new { objType = Constants.ObjectTypes.Document, /*id =*/ ids })).Select(CreateContentNodeKit); } @@ -172,16 +172,16 @@ ORDER BY n.level, n.sortOrder return uow.Database.Query(new Sql(@"SELECT n.id Id, n.uniqueId Uid, -cmsContent.contentType ContentTypeId, +uContent.contentTypeId ContentTypeId, n.level Level, n.path Path, n.sortOrder SortOrder, n.parentId ParentId, n.createDate CreateDate, n.nodeUser CreatorId, n.text PubName, ver.versionId PubVersion, ver.versionDate PubVersionDate, nuPub.data PubData FROM umbracoNode n -JOIN cmsContent ON (cmsContent.nodeId=n.id) +JOIN uContent ON (uContent.nodeId=n.id) JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) -WHERE n.nodeObjectType=@objType AND cmsContent.contentType IN (@ids) +WHERE n.nodeObjectType=@objType AND uContent.contentTypeId IN (@ids) ORDER BY n.level, n.sortOrder ", new { objType = Constants.ObjectTypes.Media, /*id =*/ ids })).Select(CreateMediaNodeKit); } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index 6e735c0255..9e74feee10 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -1258,9 +1258,9 @@ WHERE cmsContentNu.nodeId IN ( db.Execute(@"DELETE FROM cmsContentNu WHERE cmsContentNu.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = contentObjectType, ctypes = contentTypeIdsA }); } @@ -1329,9 +1329,9 @@ WHERE cmsContentNu.nodeId IN ( db.Execute(@"DELETE FROM cmsContentNu WHERE cmsContentNu.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = mediaObjectType, ctypes = contentTypeIdsA }); } @@ -1390,9 +1390,9 @@ WHERE cmsContentNu.nodeId IN ( db.Execute(@"DELETE FROM cmsContentNu WHERE cmsContentNu.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = memberObjectType, ctypes = contentTypeIdsA }); } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs index 342b8b65d4..0164eb9eff 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs @@ -862,8 +862,8 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; FROM umbracoNode JOIN cmsContentXml ON (cmsContentXml.nodeId=umbracoNode.id) JOIN cmsDocument ON (cmsDocument.nodeId=umbracoNode.id) -JOIN cmsContent ON (cmsDocument.nodeId=cmsContent.nodeId) -WHERE umbracoNode.nodeObjectType = @nodeObjectType AND cmsDocument.published=1 AND cmsContent.contentType IN (@ids) +JOIN uContent ON (cmsDocument.nodeId=uContent.nodeId) +WHERE umbracoNode.nodeObjectType = @nodeObjectType AND cmsDocument.published=1 AND uContent.contentTypeId IN (@ids) ORDER BY umbracoNode.level, umbracoNode.sortOrder"; private const string ReadMoreCmsContentXmlSql = @"SELECT @@ -1726,15 +1726,15 @@ WHERE cmsContentXml.nodeId IN ( // db.Execute(@"DELETE cmsContentXml //FROM cmsContentXml //JOIN umbracoNode ON (cmsContentXml.nodeId=umbracoNode.Id) - //JOIN cmsContent ON (cmsContentXml.nodeId=cmsContent.nodeId) + //JOIN uContent ON (cmsContentXml.nodeId=uContent.nodeId) //WHERE umbracoNode.nodeObjectType=@objType - //AND cmsContent.contentType IN (@ctypes)", + //AND uContent.contentTypeId IN (@ctypes)", db.Execute(@"DELETE FROM cmsContentXml WHERE cmsContentXml.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = contentObjectType, ctypes = contentTypeIdsA }); } @@ -1799,15 +1799,15 @@ WHERE cmsPreviewXml.nodeId IN ( // db.Execute(@"DELETE cmsPreviewXml //FROM cmsPreviewXml //JOIN umbracoNode ON (cmsPreviewXml.nodeId=umbracoNode.Id) - //JOIN cmsContent ON (cmsPreviewXml.nodeId=cmsContent.nodeId) + //JOIN uContent ON (cmsPreviewXml.nodeId=uContent.nodeId) //WHERE umbracoNode.nodeObjectType=@objType - //AND cmsContent.contentType IN (@ctypes)", + //AND uContent.contentTypeId IN (@ctypes)", db.Execute(@"DELETE FROM cmsPreviewXml WHERE cmsPreviewXml.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = contentObjectType, ctypes = contentTypeIdsA }); } @@ -1876,15 +1876,15 @@ WHERE cmsContentXml.nodeId IN ( // db.Execute(@"DELETE cmsContentXml //FROM cmsContentXml //JOIN umbracoNode ON (cmsContentXml.nodeId=umbracoNode.Id) - //JOIN cmsContent ON (cmsContentXml.nodeId=cmsContent.nodeId) + //JOIN uContent ON (cmsContentXml.nodeId=uContent.nodeId) //WHERE umbracoNode.nodeObjectType=@objType - //AND cmsContent.contentType IN (@ctypes)", + //AND uContent.contentTypeId IN (@ctypes)", db.Execute(@"DELETE FROM cmsContentXml WHERE cmsContentXml.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = mediaObjectType, ctypes = contentTypeIdsA }); } @@ -1947,15 +1947,15 @@ WHERE cmsContentXml.nodeId IN ( // db.Execute(@"DELETE cmsContentXml //FROM cmsContentXml //JOIN umbracoNode ON (cmsContentXml.nodeId=umbracoNode.Id) - //JOIN cmsContent ON (cmsContentXml.nodeId=cmsContent.nodeId) + //JOIN uContent ON (cmsContentXml.nodeId=uContent.nodeId) //WHERE umbracoNode.nodeObjectType=@objType - //AND cmsContent.contentType IN (@ctypes)", + //AND uContent.contentTypeId IN (@ctypes)", db.Execute(@"DELETE FROM cmsContentXml WHERE cmsContentXml.nodeId IN ( SELECT id FROM umbracoNode - JOIN cmsContent ON cmsContent.nodeId=umbracoNode.id + JOIN uContent ON uContent.nodeId=umbracoNode.id WHERE umbracoNode.nodeObjectType=@objType - AND cmsContent.contentType IN (@ctypes) + AND uContent.contentTypeId IN (@ctypes) )", new { objType = memberObjectType, ctypes = contentTypeIdsA }); }