From 2320b51df2903fa4eb75021cd25f007d0b9436f3 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 1 Nov 2018 16:18:13 +1100 Subject: [PATCH] Removes old TemplateDto.Design column --- .../Migrations/Upgrade/UmbracoPlan.cs | 1 + .../Migrations/Upgrade/V_8_0_0/DropTaskTables.cs | 7 +++++-- .../Upgrade/V_8_0_0/DropTemplateDesignColumn.cs | 15 +++++++++++++++ src/Umbraco.Core/Persistence/Dtos/TemplateDto.cs | 4 ---- .../Persistence/Factories/TemplateFactory.cs | 1 - .../Persistence/Mappers/TemplateMapper.cs | 1 - .../Repositories/Implement/TemplateRepository.cs | 10 +++------- src/Umbraco.Core/Umbraco.Core.csproj | 1 + .../Querying/ContentTypeSqlMappingTests.cs | 4 ++-- 9 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTemplateDesignColumn.cs diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs index fb0f18700c..92c08b066b 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs @@ -141,6 +141,7 @@ namespace Umbraco.Core.Migrations.Upgrade Chain("{8804D8E8-FE62-4E3A-B8A2-C047C2118C38}"); Chain("{23275462-446E-44C7-8C2C-3B8C1127B07D}"); Chain("{6B251841-3069-4AD5-8AE9-861F9523E8DA}"); + Chain("{08919C4B-B431-449C-90EC-2B8445B5C6B1}"); //FINAL diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs index f706671022..e8fd4f409e 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs @@ -1,5 +1,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { + public class DropTaskTables : MigrationBase { public DropTaskTables(IMigrationContext context) @@ -8,8 +9,10 @@ public override void Migrate() { - Delete.Table("cmsTaskType"); - Delete.Table("cmsTask"); + if (TableExists("cmsTaskType")) + Delete.Table("cmsTaskType"); + if (TableExists("cmsTask")) + Delete.Table("cmsTask"); } } } diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTemplateDesignColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTemplateDesignColumn.cs new file mode 100644 index 0000000000..f1b25403d4 --- /dev/null +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTemplateDesignColumn.cs @@ -0,0 +1,15 @@ +namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 +{ + public class DropTemplateDesignColumn : MigrationBase + { + public DropTemplateDesignColumn(IMigrationContext context) + : base(context) + { } + + public override void Migrate() + { + if(ColumnExists("cmsTemplate", "design")) + Delete.Column("design").FromTable("cmsTemplate").Do(); + } + } +} diff --git a/src/Umbraco.Core/Persistence/Dtos/TemplateDto.cs b/src/Umbraco.Core/Persistence/Dtos/TemplateDto.cs index 2f0d149ee7..a73425db8d 100644 --- a/src/Umbraco.Core/Persistence/Dtos/TemplateDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/TemplateDto.cs @@ -22,10 +22,6 @@ namespace Umbraco.Core.Persistence.Dtos [NullSetting(NullSetting = NullSettings.Null)] public string Alias { get; set; } - [Column("design")] - [SpecialDbType(SpecialDbTypes.NTEXT)] - public string Design { get; set; } - [ResultColumn] [Reference(ReferenceType.OneToOne, ColumnName = "NodeId")] public NodeDto NodeDto { get; set; } diff --git a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs index b2b5be872e..7682ea47db 100644 --- a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs @@ -45,7 +45,6 @@ namespace Umbraco.Core.Persistence.Factories var dto = new TemplateDto { Alias = entity.Alias, - Design = entity.Content ?? string.Empty, NodeDto = BuildNodeDto(entity, nodeObjectTypeId) }; diff --git a/src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs b/src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs index f402081e08..ca5faab134 100644 --- a/src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/TemplateMapper.cs @@ -24,7 +24,6 @@ namespace Umbraco.Core.Persistence.Mappers CacheMap(src => src.MasterTemplateId, dto => dto.ParentId); CacheMap(src => src.Key, dto => dto.UniqueId); CacheMap(src => src.Alias, dto => dto.Alias); - CacheMap(src => src.Content, dto => dto.Design); } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs index 415aa2bcb1..83876db599 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs @@ -181,7 +181,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement template.Path = nodeDto.Path; //now do the file work - SaveFile(template, dto); + SaveFile(template); template.ResetDirtyProperties(); @@ -236,7 +236,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement template.IsMasterTemplate = axisDefs.Any(x => x.ParentId == dto.NodeId); //now do the file work - SaveFile((Template) entity, dto, originalAlias); + SaveFile((Template) entity, originalAlias); entity.ResetDirtyProperties(); @@ -245,7 +245,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement template.GetFileContent = file => GetFileContent((Template) file, false); } - private void SaveFile(Template template, TemplateDto dto, string originalAlias = null) + private void SaveFile(Template template, string originalAlias = null) { string content; @@ -275,10 +275,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement // once content has been set, "template on disk" are not "on disk" anymore template.Content = content; SetVirtualPath(template); - - if (dto.Design == content) return; - dto.Design = content; - Database.Update(dto); // though... we don't care about the db value really??!! } protected override void PersistDeletedItem(ITemplate entity) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index acda9ef589..03ab648928 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -359,6 +359,7 @@ + diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs index 64e8d41669..ce6447f4b5 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs @@ -35,8 +35,8 @@ namespace Umbraco.Tests.Persistence.Querying scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); - scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55554, Alias = "testTemplate1", Design = "", PrimaryKey = 22221}); - scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55555, Alias = "testTemplate2", Design = "", PrimaryKey = 22222 }); + scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55554, Alias = "testTemplate1", PrimaryKey = 22221}); + scope.Database.Insert("cmsTemplate", "pk", false, new TemplateDto { NodeId = 55555, Alias = "testTemplate2", PrimaryKey = 22222 }); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType"))));