From 43d2eebaaa36d2e49ca1e47b2a9b351a2d24d937 Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Wed, 22 Sep 2021 16:27:37 +0100 Subject: [PATCH 1/2] Add migration for isMaster column to isSchedulingPublisher --- .../Migrations/Upgrade/UmbracoPlan.cs | 3 +++ .../Upgrade/V_9_0_0/UmbracoServerColumn.cs | 20 +++++++++++++++++++ .../Persistence/Dtos/ServerRegistrationDto.cs | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_9_0_0/UmbracoServerColumn.cs diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index e3b4d693c7..277a236e24 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -246,6 +246,9 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade .To("{12DCDE7F-9AB7-4617-804F-AB66BF360980}") .As("{5AAE6276-80DB-4ACF-B845-199BC6C37538}"); + // TO 9.0.0-rc4 + To("5E02F241-5253-403D-B5D3-7DB00157E20F"); + // TO 9.0.0 } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_9_0_0/UmbracoServerColumn.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_9_0_0/UmbracoServerColumn.cs new file mode 100644 index 0000000000..601f2bd966 --- /dev/null +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_9_0_0/UmbracoServerColumn.cs @@ -0,0 +1,20 @@ +using Umbraco.Cms.Infrastructure.Persistence.Dtos; + +namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_9_0_0 +{ + public class UmbracoServerColumn : MigrationBase + { + public UmbracoServerColumn(IMigrationContext context) + : base(context) + { + } + + /// + /// Adds new columns to members table + /// + protected override void Migrate() + { + ReplaceColumn(Cms.Core.Constants.DatabaseSchema.Tables.Server, "isMaster", "isSchedulingPublisher"); + } + } +} diff --git a/src/Umbraco.Infrastructure/Persistence/Dtos/ServerRegistrationDto.cs b/src/Umbraco.Infrastructure/Persistence/Dtos/ServerRegistrationDto.cs index a82a5ca748..902facec84 100644 --- a/src/Umbraco.Infrastructure/Persistence/Dtos/ServerRegistrationDto.cs +++ b/src/Umbraco.Infrastructure/Persistence/Dtos/ServerRegistrationDto.cs @@ -34,7 +34,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Dtos [Index(IndexTypes.NonClustered)] public bool IsActive { get; set; } - [Column("isMaster")] + [Column("isSchedulingPublisher")] public bool IsSchedulingPublisher { get; set; } } } From a3ca09c82e690859c132488eb68290237dfd0643 Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Wed, 22 Sep 2021 17:41:18 +0100 Subject: [PATCH 2/2] Update SQL that contains isMaster --- .../Repositories/Implement/ServerRegistrationRepository.cs | 2 +- .../Persistence/NPocoTests/NPocoBulkInsertTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ServerRegistrationRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ServerRegistrationRepository.cs index 66498b3f67..98aef6fa6d 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ServerRegistrationRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ServerRegistrationRepository.cs @@ -121,7 +121,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement { var timeoutDate = DateTime.Now.Subtract(staleTimeout); - Database.Update("SET isActive=0, isMaster=0 WHERE lastNotifiedDate < @timeoutDate", new { /*timeoutDate =*/ timeoutDate }); + Database.Update("SET isActive=0, isSchedulingPublisher=0 WHERE lastNotifiedDate < @timeoutDate", new { /*timeoutDate =*/ timeoutDate }); ClearCache(); } } diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs index 290d018df9..7fd90c97b3 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs @@ -175,7 +175,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPoco // Assert Assert.That( commands[0].CommandText, - Is.EqualTo("INSERT INTO [umbracoServer] ([umbracoServer].[address], [umbracoServer].[computerName], [umbracoServer].[registeredDate], [umbracoServer].[lastNotifiedDate], [umbracoServer].[isActive], [umbracoServer].[isMaster]) VALUES (@0,@1,@2,@3,@4,@5), (@6,@7,@8,@9,@10,@11)")); + Is.EqualTo("INSERT INTO [umbracoServer] ([umbracoServer].[address], [umbracoServer].[computerName], [umbracoServer].[registeredDate], [umbracoServer].[lastNotifiedDate], [umbracoServer].[isActive], [umbracoServer].[isSchedulingPublisher]) VALUES (@0,@1,@2,@3,@4,@5), (@6,@7,@8,@9,@10,@11)")); } [Test]