Skip to content

Commit 6a53302

Browse files
committed
Improved MultiTenantMigrateExecuter
1 parent f50f57d commit 6a53302

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/Tools/AbpCompanyName.AbpProjectName.Migrator/MultiTenantMigrateExecuter.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Configuration;
44
using Abp.Dependency;
55
using Abp.Domain.Repositories;
6+
using Abp.Domain.Uow;
67
using Abp.Extensions;
78
using Abp.MultiTenancy;
89
using Abp.Runtime.Security;
@@ -16,28 +17,31 @@ public class MultiTenantMigrateExecuter : ITransientDependency
1617

1718
private readonly IAbpZeroDbMigrator _migrator;
1819
private readonly IRepository<Tenant> _tenantRepository;
20+
private readonly IDbPerTenantConnectionStringResolver _connectionStringResolver;
1921

2022
public MultiTenantMigrateExecuter(
2123
IAbpZeroDbMigrator migrator,
2224
IRepository<Tenant> tenantRepository,
23-
Log log)
25+
Log log,
26+
IDbPerTenantConnectionStringResolver connectionStringResolver)
2427
{
2528
Log = log;
29+
_connectionStringResolver = connectionStringResolver;
2630

2731
_migrator = migrator;
2832
_tenantRepository = tenantRepository;
2933
}
3034

3135
public void Run(bool skipConnVerification)
3236
{
33-
var connStr = ConfigurationManager.ConnectionStrings["Default"];
34-
if (connStr == null || connStr.ConnectionString.IsNullOrWhiteSpace())
37+
var hostConnStr = _connectionStringResolver.GetNameOrConnectionString(new ConnectionStringResolveArgs(MultiTenancySides.Host));
38+
if (hostConnStr.IsNullOrWhiteSpace())
3539
{
3640
Log.Write("Configuration file should contain a connection string named 'Default'");
3741
return;
3842
}
3943

40-
Log.Write("Host database: " + connStr.ConnectionString);
44+
Log.Write("Host database: " + hostConnStr);
4145
if (!skipConnVerification)
4246
{
4347
Log.Write("Continue to migration for this host database and all tenants..? (Y/N): ");

0 commit comments

Comments
 (0)