Skip to content

Commit 0dbf4e0

Browse files
Move everything to AsyncMigrationBase (#516)
Co-authored-by: patrickdemooij9 <[email protected]>
1 parent 7308242 commit 0dbf4e0

13 files changed

Lines changed: 60 additions & 33 deletions

File tree

src/SeoToolkit.Umbraco.MetaFields.Core/Migrations/MetaFieldsInitialMigration.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
using SeoToolkit.Umbraco.MetaFields.Core.Models.DocumentTypeSettings.Database;
33
using SeoToolkit.Umbraco.MetaFields.Core.Models.MetaFieldsSettings.Database;
44
using SeoToolkit.Umbraco.MetaFields.Core.Models.SeoSettings.Database;
5+
using System.Threading.Tasks;
56

67
namespace SeoToolkit.Umbraco.MetaFields.Core.Migrations
78
{
8-
public class MetaFieldsInitialMigration : MigrationBase
9+
public class MetaFieldsInitialMigration : AsyncMigrationBase
910
{
1011
public MetaFieldsInitialMigration(IMigrationContext context) : base(context)
1112
{
1213
}
1314

14-
protected override void Migrate()
15+
protected override Task MigrateAsync()
1516
{
1617
if (TableExists("uSeoToolkitMetaFieldsSettings"))
1718
{
@@ -30,6 +31,7 @@ protected override void Migrate()
3031
{
3132
Create.Table<MetaFieldsValueEntity>().Do();
3233
}
34+
return Task.CompletedTask;
3335
}
3436
}
3537
}

src/SeoToolkit.Umbraco.MetaFields.Core/Migrations/MetaFieldsUmbraco14Migration.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
using NPoco;
33
using SeoToolkit.Umbraco.MetaFields.Core.Models.SeoSettings.Database;
44
using System.Linq;
5+
using System.Threading.Tasks;
56
using Umbraco.Cms.Core;
67
using Umbraco.Cms.Infrastructure.Migrations;
78
using Umbraco.Cms.Infrastructure.Persistence.DatabaseAnnotations;
89

910
namespace SeoToolkit.Umbraco.MetaFields.Core.Migrations
1011
{
11-
public class MetaFieldsUmbraco14Migration : MigrationBase
12+
public class MetaFieldsUmbraco14Migration : AsyncMigrationBase
1213
{
1314
public MetaFieldsUmbraco14Migration(IMigrationContext context) : base(context)
1415
{
1516
}
1617

17-
protected override void Migrate()
18+
protected override Task MigrateAsync()
1819
{
1920
var itemsWithImages = Database.Fetch<OldMetaFieldsValueEntity>().Where(it => it.Alias == "openGraphImage");
2021
foreach (var item in itemsWithImages)
@@ -30,6 +31,7 @@ protected override void Migrate()
3031

3132
Database.Update(item);
3233
}
34+
return Task.CompletedTask;
3335
}
3436

3537
[TableName("SeoToolkitMetaFieldsValue")]

src/SeoToolkit.Umbraco.MetaFields.Core/Migrations/MetaFieldsValueTextMigration.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
using SeoToolkit.Umbraco.MetaFields.Core.Migrations.Entities._5_0_0;
22
using SeoToolkit.Umbraco.MetaFields.Core.Models.SeoSettings.Database;
3+
using System.Threading.Tasks;
34
using Umbraco.Cms.Infrastructure.Migrations;
45
using Umbraco.Extensions;
56

67
namespace SeoToolkit.Umbraco.MetaFields.Core.Migrations
78
{
8-
public class MetaFieldsValueTextMigration : MigrationBase
9+
public class MetaFieldsValueTextMigration : AsyncMigrationBase
910
{
1011
public MetaFieldsValueTextMigration(IMigrationContext context) : base(context)
1112
{
1213
}
1314

14-
protected override void Migrate()
15+
protected override Task MigrateAsync()
1516
{
1617
if (DatabaseType == NPoco.DatabaseType.SQLite)
1718
{
@@ -27,6 +28,7 @@ protected override void Migrate()
2728
{
2829
Database.Execute($"ALTER TABLE SeoToolkitMetaFieldsValue ALTER COLUMN UserValue nvarchar(max);");
2930
}
31+
return Task.CompletedTask;
3032
}
3133
}
3234
}
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System;
2+
using System.Threading.Tasks;
23
using Umbraco.Cms.Core.Services;
34
using Umbraco.Cms.Infrastructure.Migrations;
45

56
namespace SeoToolkit.Umbraco.NotFound.Core.Migrations
67
{
7-
public class NotFoundUmbraco13Migration : MigrationBase
8+
public class NotFoundUmbraco13Migration : AsyncMigrationBase
89
{
910
private readonly IKeyValueService _keyValueService;
1011
private readonly IContentService _contentService;
@@ -17,17 +18,18 @@ public NotFoundUmbraco13Migration(IMigrationContext context,
1718
_contentService = contentService;
1819
}
1920

20-
protected override void Migrate()
21+
protected override Task MigrateAsync()
2122
{
2223
var notFoundValue = _keyValueService.GetValue(NotFoundConstants.NotFoundKeyValueKey);
23-
if (string.IsNullOrWhiteSpace(notFoundValue)) return;
24-
if (Guid.TryParse(notFoundValue, out _)) return;
25-
if (!int.TryParse(notFoundValue, out var notFoundId)) return;
24+
if (string.IsNullOrWhiteSpace(notFoundValue)) return Task.CompletedTask;
25+
if (Guid.TryParse(notFoundValue, out _)) return Task.CompletedTask;
26+
if (!int.TryParse(notFoundValue, out var notFoundId)) return Task.CompletedTask;
2627

2728
var content = _contentService.GetById(notFoundId);
28-
if (content is null) return;
29+
if (content is null) return Task.CompletedTask;
2930

3031
_keyValueService.SetValue(NotFoundConstants.NotFoundKeyValueKey, content.Key.ToString());
32+
return Task.CompletedTask;
3133
}
3234
}
3335
}

src/SeoToolkit.Umbraco.Redirects.Core/Migrations/CreatedByMigration.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
using SeoToolkit.Umbraco.Redirects.Core.Migrations.Entities;
44
using SeoToolkit.Umbraco.Redirects.Core.Models.Database;
55
using System;
6+
using System.Threading.Tasks;
67
using Umbraco.Cms.Infrastructure.Migrations;
78

89
namespace SeoToolkit.Umbraco.Redirects.Core.Migrations
910
{
10-
internal class CreatedByMigration : MigrationBase
11+
internal class CreatedByMigration : AsyncMigrationBase
1112
{
1213
public CreatedByMigration(IMigrationContext context) : base(context)
1314
{
1415
}
1516

16-
protected override void Migrate()
17+
protected override Task MigrateAsync()
1718
{
1819
if (!ColumnExists("SeoToolkitRedirects", "CreatedBy"))
1920
{
@@ -25,13 +26,14 @@ protected override void Migrate()
2526
Database.Execute("UPDATE SeoToolkitRedirects SET CreatedBy = -1");
2627

2728
MigrationHelper.RecreateTable<CreatedByEntity>(Database, Create, Sql(), "SeoToolkitRedirects");
28-
return;
29+
return Task.CompletedTask;
2930
}
3031

3132
Alter.Table("SeoToolkitRedirects").AddColumn("CreatedBy").AsInt32().Nullable().Do();
3233
Update.Table("SeoToolkitRedirects").Set(new {CreatedBy = -1}).AllRows().Do();
3334
Alter.Table("SeoToolkitRedirects").AlterColumn("CreatedBy").AsInt32().NotNullable().Do();
3435
}
36+
return Task.CompletedTask;
3537
}
3638
}
3739
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using Umbraco.Cms.Infrastructure.Migrations;
22
using SeoToolkit.Umbraco.Redirects.Core.Models.Database;
3+
using System.Threading.Tasks;
34

45
namespace SeoToolkit.Umbraco.Redirects.Core.Migrations
56
{
6-
public class InitialRedirectsMigration : MigrationBase
7+
public class InitialRedirectsMigration : AsyncMigrationBase
78
{
89
public InitialRedirectsMigration(IMigrationContext context) : base(context)
910
{
1011
}
1112

12-
protected override void Migrate()
13+
protected override Task MigrateAsync()
1314
{
1415
if (TableExists("uSeoToolkitRedirects"))
1516
{
@@ -19,6 +20,7 @@ protected override void Migrate()
1920
{
2021
Create.Table<RedirectEntity>().Do();
2122
}
23+
return Task.CompletedTask;
2224
}
2325
}
2426
}

src/SeoToolkit.Umbraco.Redirects.Core/Migrations/IsEnabledMigration.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
using SeoToolkit.Umbraco.Redirects.Core.Migrations.Entities;
44
using SeoToolkit.Umbraco.Redirects.Core.Models.Database;
55
using System;
6+
using System.Threading.Tasks;
67
using Umbraco.Cms.Infrastructure.Migrations;
78

89
namespace SeoToolkit.Umbraco.Redirects.Core.Migrations
910
{
10-
internal class IsEnabledMigration : MigrationBase
11+
internal class IsEnabledMigration : AsyncMigrationBase
1112
{
1213
public IsEnabledMigration(IMigrationContext context) : base(context)
1314
{
1415
}
1516

16-
protected override void Migrate()
17+
protected override Task MigrateAsync()
1718
{
1819
if (!ColumnExists("SeoToolkitRedirects", "IsEnabled"))
1920
{
@@ -25,13 +26,14 @@ protected override void Migrate()
2526
Database.Execute("UPDATE SeoToolkitRedirects SET IsEnabled = 1");
2627

2728
MigrationHelper.RecreateTable<IsEnabledEntity>(Database, Create, Sql(), "SeoToolkitRedirects");
28-
return;
29+
return Task.CompletedTask;
2930
}
3031

3132
Alter.Table("SeoToolkitRedirects").AddColumn("IsEnabled").AsBoolean().Nullable().Do();
3233
Update.Table("SeoToolkitRedirects").Set(new { IsEnabled = true}).AllRows().Do();
3334
Alter.Table("SeoToolkitRedirects").AlterColumn("IsEnabled").AsBoolean().NotNullable().Do();
3435
}
36+
return Task.CompletedTask;
3537
}
3638
}
3739
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using SeoToolkit.Umbraco.Redirects.Core.Models.Database;
2+
using System.Threading.Tasks;
23
using Umbraco.Cms.Infrastructure.Migrations;
34

45
namespace SeoToolkit.Umbraco.Redirects.Core.Migrations
56
{
6-
internal class OldUrlIndexMigration : MigrationBase
7+
internal class OldUrlIndexMigration : AsyncMigrationBase
78
{
89
public OldUrlIndexMigration(IMigrationContext context) : base(context)
910
{
1011
}
1112

12-
protected override void Migrate()
13+
protected override Task MigrateAsync()
1314
{
1415
if (!IndexExists("IX_SeoToolkitOldUrl"))
1516
{
@@ -19,6 +20,7 @@ protected override void Migrate()
1920
{
2021
CreateIndex<RedirectEntity>("IX_SeoToolkitRegex");
2122
}
23+
return Task.CompletedTask;
2224
}
2325
}
2426
}
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
using Umbraco.Cms.Infrastructure.Migrations;
22
using SeoToolkit.Umbraco.ScriptManager.Core.Models.Database;
3+
using System.Threading.Tasks;
34

45
namespace SeoToolkit.Umbraco.ScriptManager.Core.Migrations
56
{
6-
public class ScriptManagerInitialMigration : MigrationBase
7+
public class ScriptManagerInitialMigration : AsyncMigrationBase
78
{
89
public ScriptManagerInitialMigration(IMigrationContext context) : base(context)
910
{
1011
}
1112

12-
protected override void Migrate()
13+
protected override Task MigrateAsync()
1314
{
1415
if (TableExists("uSeoToolkitScript"))
1516
{
1617
Database.Execute("exec sp_rename 'uSeoToolkitScript', 'SeoToolkitScript'");
1718
}
1819
else if (!TableExists("SeoToolkitScript"))
1920
Create.Table<ScriptEntity>().Do();
21+
22+
return Task.CompletedTask;
2023
}
2124
}
2225
}

src/SeoToolkit.Umbraco.Sitemap.Core/Migrations/SitemapChangeFrequencyOptionalMigration.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
using SeoToolkit.Umbraco.Common.Core.Migrations;
33
using SeoToolkit.Umbraco.Sitemap.Core.Migrations.Entities._5_0_0;
44
using SeoToolkit.Umbraco.Sitemap.Core.Models.Database;
5+
using System.Threading.Tasks;
56
using Umbraco.Cms.Infrastructure.Migrations;
67
using Umbraco.Extensions;
78

89
namespace SeoToolkit.Umbraco.Sitemap.Core.Migrations
910
{
10-
public class SitemapChangeFrequencyOptionalMigration : MigrationBase
11+
public class SitemapChangeFrequencyOptionalMigration : AsyncMigrationBase
1112
{
1213
public SitemapChangeFrequencyOptionalMigration(IMigrationContext context) : base(context)
1314
{
1415
}
1516

16-
protected override void Migrate()
17+
protected override Task MigrateAsync()
1718
{
18-
if (!ColumnExists("SeoToolkitSitemapPageType", "ChangeFrequency")) return;
19+
if (!ColumnExists("SeoToolkitSitemapPageType", "ChangeFrequency")) return Task.CompletedTask;
1920

2021
if (DatabaseType == DatabaseType.SQLite)
2122
{
@@ -26,6 +27,7 @@ protected override void Migrate()
2627
{
2728
Alter.Table("SeoToolkitSitemapPageType").AlterColumn("ChangeFrequency").AsString().Nullable().Do();
2829
}
30+
return Task.CompletedTask;
2931
}
3032
}
3133
}

0 commit comments

Comments
 (0)