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

Rename IOqtaneDatabase interface (and related base class)

Browse Source
This commit is contained in:
Charles Nurse
2021-05-24 11:57:47 -07:00
parent 791e786db8
commit 4a609b444e
61 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Repository/Context/DBContextBase.cs
View File

@ -34,7 +34,7 @@ namespace Oqtane.Repository
_accessor = httpContextAccessor;
}
public IOqtaneDatabase ActiveDatabase { get; private set; }
public IDatabase ActiveDatabase { get; private set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
@ -64,7 +64,7 @@ namespace Oqtane.Repository
if (!String.IsNullOrEmpty(_databaseType))
{
var type = Type.GetType(_databaseType);
ActiveDatabase = Activator.CreateInstance(type) as IOqtaneDatabase;
ActiveDatabase = Activator.CreateInstance(type) as IDatabase;
}
if (!string.IsNullOrEmpty(_connectionString) && ActiveDatabase != null)

5
Oqtane.Server/Repository/Context/InstallationContext.cs
View File

@ -4,6 +4,7 @@ using Oqtane.Databases.Interfaces;
using Oqtane.Extensions;
using Oqtane.Interfaces;
using Oqtane.Models;
using IDatabase = Oqtane.Databases.Interfaces.IDatabase;
// ReSharper disable CheckNamespace
// ReSharper disable MemberCanBePrivate.Global
@ -15,9 +16,9 @@ namespace Oqtane.Repository
public class InstallationContext : DbContext
{
private readonly string _connectionString;
private readonly IOqtaneDatabase _database;
private readonly IDatabase _database;
public InstallationContext(IOqtaneDatabase database, string connectionString)
public InstallationContext(IDatabase database, string connectionString)
{
_connectionString = connectionString;
_database = database;

4
Oqtane.Server/Repository/Context/MasterDBContext.cs
View File

@ -32,7 +32,7 @@ namespace Oqtane.Repository
_configuration = configuration;
}
public IOqtaneDatabase ActiveDatabase { get; private set; }
public IDatabase ActiveDatabase { get; private set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
@ -52,7 +52,7 @@ namespace Oqtane.Repository
if (!String.IsNullOrEmpty(_databaseType))
{
var type = Type.GetType(_databaseType);
ActiveDatabase = Activator.CreateInstance(type) as IOqtaneDatabase;
ActiveDatabase = Activator.CreateInstance(type) as IDatabase;
}
if (!string.IsNullOrEmpty(_connectionString) && ActiveDatabase != null)