修复bug无法指定迁移对象 [#199]

Author: xuejmnet

samples/Sample.MySql/DbContexts/DefaultShardingDbContext.cs

@@ -28,11 +28,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfiguration(new SysUserModMap());
             modelBuilder.ApplyConfiguration(new SysTestMap());
             modelBuilder.ApplyConfiguration(new SysUserLogByMonthMap());
-            // foreach (var entityType in modelBuilder.Model.GetEntityTypes())
-            // {
-            //     _configureGlobalFiltersMethodInfo?.MakeGenericMethod(entityType.ClrType)
-            //         .Invoke(this, new object[] { modelBuilder, entityType });
-            // }
 
             modelBuilder.Entity<SysUserLogByMonth>().HasData(new SysUserLogByMonth() { Id = "1", Time = DateTime.Now });
             modelBuilder.Entity<SysTest>().HasData(new SysTest() { Id = "1", UserId = "123" });

src/ShardingCore/EFCores/ShardingMigrator.cs

@@ -78,7 +78,7 @@ public override void Migrate(string targetMigration = null)
         {
             var virtualDataSource = _shardingRuntimeContext.GetVirtualDataSource();
             var allDataSourceNames =  virtualDataSource.GetAllDataSourceNames();
-           await DynamicShardingHelper.DynamicMigrateWithDataSourcesAsync(_shardingRuntimeContext, allDataSourceNames, null,cancellationToken);
+           await DynamicShardingHelper.DynamicMigrateWithDataSourcesAsync(_shardingRuntimeContext, allDataSourceNames, null,targetMigration,cancellationToken);
 
         }
 #if NET6_0 || NET5_0 || NETSTANDARD2_1

src/ShardingCore/Helpers/DynamicShardingHelper.cs

@@ -5,6 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using ShardingCore.Core.DbContextCreator;
 using ShardingCore.Core.RuntimeContexts;
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources;
@@ -53,7 +55,7 @@ public static void DynamicAppendDataSourceOnly(IShardingRuntimeContext shardingR
         }
 
         public static async Task DynamicMigrateWithDataSourcesAsync(IShardingRuntimeContext shardingRuntimeContext,
-            List<string> allDataSourceNames,int? migrationParallelCount,CancellationToken cancellationToken = new CancellationToken())
+            List<string> allDataSourceNames,int? migrationParallelCount,string targetMigration = null,CancellationToken cancellationToken = new CancellationToken())
         {
             var dbContextCreator = shardingRuntimeContext.GetDbContextCreator();
             var shardingProvider = shardingRuntimeContext.GetShardingProvider();
@@ -74,19 +76,19 @@ public static async Task DynamicMigrateWithDataSourcesAsync(IShardingRuntimeCont
                     foreach (var migrationUnits in partitionMigrationUnits)
                     {
                         var migrateUnits = migrationUnits.Select(o =>new MigrateUnit(shellDbContext,o)).ToList();
-                        await ExecuteMigrateUnitsAsync(shardingRuntimeContext,migrateUnits,cancellationToken);
+                        await ExecuteMigrateUnitsAsync(shardingRuntimeContext,migrateUnits,targetMigration,cancellationToken);
                     }
 
                     //包含默认默认的单独最后一次处理
                     if (allDataSourceNames.Contains(defaultDataSourceName))
                     {
-                        await ExecuteMigrateUnitsAsync(shardingRuntimeContext,new List<MigrateUnit>(){new MigrateUnit(shellDbContext,defaultDataSourceName)},cancellationToken);
+                        await ExecuteMigrateUnitsAsync(shardingRuntimeContext,new List<MigrateUnit>(){new MigrateUnit(shellDbContext,defaultDataSourceName)},targetMigration,cancellationToken);
                     }
                 }
             }
         }
 
-        private static async Task ExecuteMigrateUnitsAsync(IShardingRuntimeContext shardingRuntimeContext,List<MigrateUnit> migrateUnits,CancellationToken cancellationToken = new CancellationToken())
+        private static async Task ExecuteMigrateUnitsAsync(IShardingRuntimeContext shardingRuntimeContext,List<MigrateUnit> migrateUnits,string targetMigration=null,CancellationToken cancellationToken = new CancellationToken())
         {
             var shardingMigrationManager = shardingRuntimeContext.GetShardingMigrationManager();
             var dbContextCreator = shardingRuntimeContext.GetDbContextCreator();
@@ -108,7 +110,8 @@ public static async Task DynamicMigrateWithDataSourcesAsync(IShardingRuntimeCont
                         {
                             if (( dbContext.Database.GetPendingMigrations()).Any())
                             {
-                                dbContext.Database.Migrate();
+                                var migrator = dbContext.GetService<IMigrator>();
+                                migrator.Migrate(targetMigration);
                             }
                         }