Autotest
/
sharding
mirror of https://gitee.com/dotnetchina/sharding-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
xuejiaming 2022-10-13 20:07:18 +08:00
parent 860e6dd4cb
commit 734e075182
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/Sample.MySql/DbContexts/DefaultShardingDbContext.cs
View File

@ -28,11 +28,6 @@ namespace Sample.MySql.DbContexts
modelBuilder.ApplyConfiguration(new SysUserModMap()); modelBuilder.ApplyConfiguration(new SysUserModMap());
modelBuilder.ApplyConfiguration(new SysTestMap()); modelBuilder.ApplyConfiguration(new SysTestMap());
modelBuilder.ApplyConfiguration(new SysUserLogByMonthMap()); 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<SysUserLogByMonth>().HasData(new SysUserLogByMonth() { Id = "1", Time = DateTime.Now });
modelBuilder.Entity<SysTest>().HasData(new SysTest() { Id = "1", UserId = "123" }); modelBuilder.Entity<SysTest>().HasData(new SysTest() { Id = "1", UserId = "123" });

2
src/ShardingCore/EFCores/ShardingMigrator.cs
View File

@ -78,7 +78,7 @@ namespace ShardingCore.EFCores
{ {
var virtualDataSource = _shardingRuntimeContext.GetVirtualDataSource(); var virtualDataSource = _shardingRuntimeContext.GetVirtualDataSource();
var allDataSourceNames = virtualDataSource.GetAllDataSourceNames(); 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 #if NET6_0 || NET5_0 || NETSTANDARD2_1

13
src/ShardingCore/Helpers/DynamicShardingHelper.cs
View File

@ -5,6 +5,8 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using ShardingCore.Core.DbContextCreator; using ShardingCore.Core.DbContextCreator;
using ShardingCore.Core.RuntimeContexts; using ShardingCore.Core.RuntimeContexts;
using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources; using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources;
@ -53,7 +55,7 @@ namespace ShardingCore.Helpers
} }
public static async Task DynamicMigrateWithDataSourcesAsync(IShardingRuntimeContext shardingRuntimeContext, 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 dbContextCreator = shardingRuntimeContext.GetDbContextCreator();
var shardingProvider = shardingRuntimeContext.GetShardingProvider(); var shardingProvider = shardingRuntimeContext.GetShardingProvider();
@ -74,19 +76,19 @@ namespace ShardingCore.Helpers
foreach (var migrationUnits in partitionMigrationUnits) foreach (var migrationUnits in partitionMigrationUnits)
{ {
var migrateUnits = migrationUnits.Select(o =>new MigrateUnit(shellDbContext,o)).ToList(); 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)) 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 shardingMigrationManager = shardingRuntimeContext.GetShardingMigrationManager();
var dbContextCreator = shardingRuntimeContext.GetDbContextCreator(); var dbContextCreator = shardingRuntimeContext.GetDbContextCreator();
@ -108,7 +110,8 @@ namespace ShardingCore.Helpers
{ {
if (( dbContext.Database.GetPendingMigrations()).Any()) if (( dbContext.Database.GetPendingMigrations()).Any())
{ {
dbContext.Database.Migrate(); var migrator = dbContext.GetService<IMigrator>();
migrator.Migrate(targetMigration);
} }
} }