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

Add support for Sqlite - Installation path tested but AddSite not supported yet

Browse Source
This commit is contained in:
Charles Nurse
2021-03-23 11:06:18 -07:00
parent 8f1c760e87
commit cbcfc88492
22 changed files with 227 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,48 +7,62 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Oqtane.Extensions;
using Oqtane.Models;
using Oqtane.Shared;
// ReSharper disable BuiltInTypeReferenceStyleForMemberAccess
namespace Oqtane.Repository
{
public class DBContextBase : IdentityUserContext<IdentityUser>
{
private readonly IDbConfig _dbConfig;
private readonly ITenantResolver _tenantResolver;
private readonly IHttpContextAccessor _accessor;
private readonly IConfiguration _configuration;
private string _connectionString;
private string _databaseType;
public DBContextBase(ITenantResolver tenantResolver, IHttpContextAccessor httpContextAccessor)
{
_connectionString = String.Empty;
_tenantResolver = tenantResolver;
_accessor = httpContextAccessor;
}
public DBContextBase(IDbConfig dbConfig, ITenantResolver tenantResolver)
{
_dbConfig = dbConfig;
_accessor = dbConfig.Accessor;
_configuration = dbConfig.Configuration;
_connectionString = dbConfig.ConnectionString;
_databaseType = dbConfig.DatabaseType;
_tenantResolver = tenantResolver;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
var connectionString = _dbConfig.ConnectionString;
if (string.IsNullOrEmpty(connectionString) && _tenantResolver != null)
if (string.IsNullOrEmpty(_connectionString) && _tenantResolver != null)
{
var tenant = _tenantResolver.GetTenant();
var configuration = _dbConfig.Configuration;
if (tenant != null)
{
connectionString = tenant.DBConnectionString
_connectionString = tenant.DBConnectionString
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString());
_databaseType = tenant.DBType;
}
else
{
if (!String.IsNullOrEmpty(configuration.GetConnectionString("DefaultConnection")))
if (!String.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
{
connectionString = configuration.GetConnectionString("DefaultConnection")
_connectionString = _configuration.GetConnectionString("DefaultConnection")
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString());
}
_databaseType = _configuration.GetSection(SettingKeys.DatabaseSection)[SettingKeys.DatabaseTypeKey];
}
}
if (!string.IsNullOrEmpty(connectionString))
if (!string.IsNullOrEmpty(_connectionString) && !string.IsNullOrEmpty(_databaseType))
{
optionsBuilder.UseOqtaneDatabase(connectionString);
optionsBuilder.UseOqtaneDatabase(_databaseType, _connectionString);
}
base.OnConfiguring(optionsBuilder);
@ -56,7 +70,7 @@ namespace Oqtane.Repository
public override int SaveChanges()
{
DbContextUtils.SaveChanges(this, _dbConfig.Accessor);
DbContextUtils.SaveChanges(this, _accessor);
return base.SaveChanges();
}

2
Oqtane.Server/Repository/Context/DbConfig.cs
View File

@ -16,5 +16,7 @@ namespace Oqtane.Repository
public IConfiguration Configuration { get; }
public string ConnectionString { get; set; }
public string DatabaseType { get; set; }
}
}

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

@ -9,14 +9,16 @@ namespace Oqtane.Repository
public class InstallationContext : DbContext
{
private readonly string _connectionString;
private readonly string _databaseType;
public InstallationContext(string connectionString)
public InstallationContext(string databaseType, string connectionString)
{
_connectionString = connectionString;
_databaseType = databaseType;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
=> optionsBuilder.UseOqtaneDatabase(_connectionString);
=> optionsBuilder.UseOqtaneDatabase(_databaseType, _connectionString);
public virtual DbSet<Alias> Alias { get; set; }
public virtual DbSet<Tenant> Tenant { get; set; }

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

@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
using Microsoft.Extensions.Configuration;
using Oqtane.Extensions;
using Oqtane.Shared;
// ReSharper disable BuiltInTypeReferenceStyleForMemberAccess
// ReSharper disable UnusedAutoPropertyAccessor.Global
@ -24,6 +25,7 @@ namespace Oqtane.Repository
{
var connectionString = _dbConfig.ConnectionString;
var configuration = _dbConfig.Configuration;
var databaseType = _dbConfig.DatabaseType;
if(string.IsNullOrEmpty(connectionString) && configuration != null)
{
@ -33,11 +35,12 @@ namespace Oqtane.Repository
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString());
}
databaseType = configuration.GetSection(SettingKeys.DatabaseSection)[SettingKeys.DatabaseTypeKey];
}
if (!string.IsNullOrEmpty(connectionString))
{
optionsBuilder.UseOqtaneDatabase(connectionString);
optionsBuilder.UseOqtaneDatabase(databaseType, connectionString);
}
base.OnConfiguring(optionsBuilder);
}

1
Oqtane.Server/Repository/Interfaces/IDbConfig.cs
View File

@ -10,5 +10,6 @@ namespace Oqtane.Repository
public IConfiguration Configuration { get; }
public string ConnectionString { get; set; }
public string DatabaseType { get; set; }
}
}