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

Attempt to resolve conflict in DatabaseManager

Browse Source
This commit is contained in:
Charles Nurse 2021-04-19 11:50:25 -07:00
parent 20b5a10882
commit 2402cab3f3
1 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -234,7 +234,8 @@ namespace Oqtane.Infrastructure
using (var masterDbContext = new MasterDBContext(new DbContextOptions<MasterDBContext>(), dbConfig)) using (var masterDbContext = new MasterDBContext(new DbContextOptions<MasterDBContext>(), dbConfig))
{ {
if (IsInstalled() && (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB")) var installation = IsInstalled();
if (installation.Success && (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB"))
{ {
UpgradeSqlServer(sql, install.ConnectionString, true); UpgradeSqlServer(sql, install.ConnectionString, true);
} }
@ -489,8 +490,6 @@ namespace Oqtane.Infrastructure
var tenant = tenants.GetTenants().FirstOrDefault(item => item.Name == install.TenantName); var tenant = tenants.GetTenants().FirstOrDefault(item => item.Name == install.TenantName);
if (tenant != null)
{
site = new Site site = new Site
{ {
TenantId = tenant.TenantId, TenantId = tenant.TenantId,
@ -561,7 +560,6 @@ namespace Oqtane.Infrastructure
tenant.Version = Constants.Version; tenant.Version = Constants.Version;
tenants.UpdateTenant(tenant); tenants.UpdateTenant(tenant);
}
if (site != null) log.Log(site.SiteId, LogLevel.Trace, this, LogFunction.Create, "Site Created {Site}", site); if (site != null) log.Log(site.SiteId, LogLevel.Trace, this, LogFunction.Create, "Site Created {Site}", site);
} }