Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove DbConfig and new constructors on DbContextBase and refactor Migrations to use explcit generation of IOqtaneDatabase instance

Browse Source
This commit is contained in:
Charles Nurse
2021-05-12 15:17:40 -07:00
parent c958f90ee2
commit c036a9d11f
34 changed files with 137 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Migrations/Framework/MultiDatabaseMigration.cs
View File

@ -7,14 +7,14 @@ namespace Oqtane.Migrations
{
public abstract class MultiDatabaseMigration : Migration
{
private readonly IEnumerable<IOqtaneDatabase> _databases;
private readonly IOqtaneDatabase _databases;
protected MultiDatabaseMigration(IEnumerable<IOqtaneDatabase> databases)
protected MultiDatabaseMigration(IOqtaneDatabase database)
{
_databases = databases;
ActiveDatabase = database;
}
protected IOqtaneDatabase ActiveDatabase => _databases.FirstOrDefault(d => d.Provider == ActiveProvider);
protected IOqtaneDatabase ActiveDatabase { get; }
protected string RewriteName(string name)
{

8
Oqtane.Server/Migrations/Framework/MultiDatabaseMigrationsAssembly.cs
View File

@ -13,7 +13,7 @@ namespace Oqtane.Migrations.Framework
{
public class MultiDatabaseMigrationsAssembly: MigrationsAssembly
{
private readonly IEnumerable<IOqtaneDatabase> _databases;
private readonly IOqtaneDatabase _database;
public MultiDatabaseMigrationsAssembly(
ICurrentDbContext currentContext,
@ -23,15 +23,15 @@ namespace Oqtane.Migrations.Framework
: base(currentContext, options, idGenerator, logger)
{
var multiDatabaseContext = currentContext.Context as IMultiDatabase;
if (multiDatabaseContext != null) _databases = multiDatabaseContext.Databases;
if (multiDatabaseContext != null) _database = multiDatabaseContext.ActiveDatabase;
}
public override Migration CreateMigration(TypeInfo migrationClass, string activeProvider)
{
var hasCtorWithCacheOptions = migrationClass.GetConstructor(new[] { typeof(IEnumerable<IOqtaneDatabase>) }) != null;
var hasCtorWithCacheOptions = migrationClass.GetConstructor(new[] { typeof(IOqtaneDatabase) }) != null;
if (hasCtorWithCacheOptions)
{
var migration = (Migration)Activator.CreateInstance(migrationClass.AsType(), _databases);
var migration = (Migration)Activator.CreateInstance(migrationClass.AsType(), _database);
if (migration != null)
{
migration.ActiveProvider = activeProvider;