Renamed cancellation token param.

siisltd · Apr 14, 2023 · 5c83049 · 5c83049
1 parent 548babf
commit 5c83049
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 22 deletions.
diff --git a/src/Curiosity.Migrations/CHANGELOG.md b/src/Curiosity.Migrations/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.1.3] - 2023-04-14
+
+### Changed
+
+- Renamed cancellation token param.
+
 ## [4.1.2] - 2023-04-12
 
 ### Fixed

diff --git a/src/Curiosity.Migrations/Curiosity.Migrations.csproj b/src/Curiosity.Migrations/Curiosity.Migrations.csproj
@@ -7,7 +7,7 @@
         <PackageTags>migrations; migration; migrator; versioning; migration-tool; .net-core; .netstandard; database; siisltd; curiosity</PackageTags>
         <Language>English</Language>
 
-        <PackageVersion>4.1.2</PackageVersion>
+        <PackageVersion>4.1.3</PackageVersion>
         <AssemblyVersion>1.0.0</AssemblyVersion>
         <FileVersion>1.0.0</FileVersion>
 

diff --git a/src/Curiosity.Migrations/Migrations/CodeMigration.cs b/src/Curiosity.Migrations/Migrations/CodeMigration.cs
@@ -67,5 +67,5 @@ public abstract class CodeMigration : IMigration
     }
 
     /// <inheritdoc />
-    public abstract Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default);
+    public abstract Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default);
 }
diff --git a/src/Curiosity.Migrations/Migrations/IMigration.cs b/src/Curiosity.Migrations/Migrations/IMigration.cs
@@ -40,7 +40,7 @@ public interface IMigration
     /// Upgrades database to the version specified in <see cref="Version"/>.
     /// </summary>
     /// <param name="transaction">Transaction in which operation must be executed. Optional. Use it when you need attach transaction to Entity Framework data context.</param>
-    /// <param name="token">Cancellation token.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>Task associated with upgrade.</returns>
-    Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default);
+    Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default);
 }
diff --git a/src/Curiosity.Migrations/Migrations/ScriptMigration.cs b/src/Curiosity.Migrations/Migrations/ScriptMigration.cs
@@ -62,9 +62,9 @@ public class ScriptMigration : IMigration
     }
 
     /// <inheritdoc />
-    public async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default)
+    public async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default)
     {
-        await RunBatchesAsync(UpScripts, token);
+        await RunBatchesAsync(UpScripts, cancellationToken);
     }
 
     /// <summary>

diff --git a/...ntegrationTests/Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_2_0.cs b/...ntegrationTests/Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_2_0.cs
@@ -13,8 +13,8 @@ public class CodeMigration_2_0 : CodeMigration
     public override string Comment => "Correct script via provider";
 
     /// <inheritdoc />
-    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default)
+    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default)
     {
-        await MigrationConnection.ExecuteNonQuerySqlAsync("select 1;", null, token);
+        await MigrationConnection.ExecuteNonQuerySqlAsync("select 1;", null, cancellationToken);
     }
 }
diff --git a/...ntegrationTests/Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_3_0.cs b/...ntegrationTests/Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_3_0.cs
@@ -16,7 +16,7 @@ public class CodeMigration_3_0 : CodeMigration
     public override string Comment { get; } = "Migration using multiple EF context with one connection";
 
     /// <inheritdoc />
-    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default)
+    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default)
     {
         var tempContextOptionsBuilder = new DbContextOptionsBuilder<TempContext>();
         tempContextOptionsBuilder.UseNpgsql(MigrationConnection.Connection!);
@@ -27,8 +27,8 @@ public override async Task UpgradeAsync(DbTransaction? transaction = null, Cance
         await using (var tempContext = new TempContext(tempContextOptionsBuilder.Options))
         await using (var anotherContext = new AnotherTempContext(anotherTempContextOptionsBuilder.Options))
         {
-            await tempContext.Database.UseTransactionAsync(transaction, token);
-            await anotherContext.Database.UseTransactionAsync(transaction, token);
+            await tempContext.Database.UseTransactionAsync(transaction, cancellationToken);
+            await anotherContext.Database.UseTransactionAsync(transaction, cancellationToken);
 
             var request1 = new BackgroundProcessorRequestEntity
             {

diff --git a/...Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_5_0 _TransactionOff.cs b/...Curiosity.Migrations.TransactionTests/CodeMigrations/CodeMigration_5_0 _TransactionOff.cs
@@ -20,7 +20,7 @@ public CodeMigration_5_0()
         IsTransactionRequired = false;
     }
 
-    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken token = default)
+    public override async Task UpgradeAsync(DbTransaction? transaction = null, CancellationToken cancellationToken = default)
     {
         var tempContextOptionsBuilder = new DbContextOptionsBuilder<TempContext>();
         tempContextOptionsBuilder.UseNpgsql(MigrationConnection.Connection!);
@@ -58,8 +58,8 @@ await using (var anotherContext = new AnotherTempContext(anotherTempContextOptio
             tempContext.Requests.Add(request1);
             anotherContext.Requests.Add(request2);
 
-            await tempContext.SaveChangesAsync(token);
-            await anotherContext.SaveChangesAsync(token);
+            await tempContext.SaveChangesAsync(cancellationToken);
+            await anotherContext.SaveChangesAsync(cancellationToken);
         }
     }
 

diff --git a/.../UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/FourthMigrationWithDependency.cs b/.../UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/FourthMigrationWithDependency.cs
@@ -22,12 +22,12 @@ public FourthMigrationWithDependency(DependencyService dependencyService)
 
 
     /// <inheritdoc />
-    public override Task UpgradeAsync(DbTransaction transaction, CancellationToken token = default)
+    public override Task UpgradeAsync(DbTransaction transaction, CancellationToken cancellationToken = default)
     {
         return MigrationConnection.ExecuteNonQuerySqlAsync(
             ScriptConstants.UpScript,
             null,
-            token);
+            cancellationToken);
     }
 
     /// <inheritdoc />

diff --git a/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/InitialMigrations.cs b/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/InitialMigrations.cs
@@ -12,12 +12,12 @@ public class InitialMigration : CodeMigration, IDowngradeMigration
     public override string Comment => "comment";
 
     /// <inheritdoc />
-    public override Task UpgradeAsync(DbTransaction transaction, CancellationToken token = default)
+    public override Task UpgradeAsync(DbTransaction transaction, CancellationToken cancellationToken = default)
     {
         return MigrationConnection.ExecuteNonQuerySqlAsync(
             ScriptConstants.UpScript,
             null,
-            token);
+            cancellationToken);
     }
 
     /// <inheritdoc />

diff --git a/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/SecondMigration.cs b/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/SecondMigration.cs
@@ -12,12 +12,12 @@ public class SecondMigration : CodeMigration, ISpecificCodeMigrations, IDowngrad
     public override string Comment => "comment";
 
     /// <inheritdoc />
-    public override Task UpgradeAsync(DbTransaction transaction = null, CancellationToken token = default)
+    public override Task UpgradeAsync(DbTransaction transaction = null, CancellationToken cancellationToken = default)
     {
         return MigrationConnection.ExecuteNonQuerySqlAsync(
             ScriptConstants.UpScript,
             null,
-            token);
+            cancellationToken);
     }
 
     /// <inheritdoc />

diff --git a/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/ThirdMigration.cs b/tests/UnitTests/Curiosity.Migrations.UnitTests/CodeMigrations/ThirdMigration.cs
@@ -13,12 +13,12 @@ public class ThirdMigration : CodeMigration, ISpecificCodeMigrations, IDowngrade
     public override string Comment => "comment";
 
     /// <inheritdoc />
-    public override Task UpgradeAsync(DbTransaction transaction = null, CancellationToken token = default)
+    public override Task UpgradeAsync(DbTransaction transaction = null, CancellationToken cancellationToken = default)
     {
         return MigrationConnection.ExecuteNonQuerySqlAsync(
             ScriptConstants.UpScript,
             null,
-            token);
+            cancellationToken);
     }
 
     /// <inheritdoc />