kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2431 from chlupac/InstallFix

Browse Source 
Unattended installation fix
This commit is contained in:
Shaun Walker 2022-09-30 11:49:06 -04:00 committed by GitHub
commit 68ada8fbe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,6 @@ namespace Oqtane.Infrastructure
if (!string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey))) if (!string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))
{ {
result.Success = true;
using (var db = GetInstallationContext()) using (var db = GetInstallationContext())
{ {
if (db.Database.CanConnect()) if (db.Database.CanConnect())
@ -60,6 +59,7 @@ namespace Oqtane.Infrastructure
{ {
// verify master database contains a Tenant table ( ie. validate schema is properly provisioned ) // verify master database contains a Tenant table ( ie. validate schema is properly provisioned )
var provisioned = db.Tenant.Any(); var provisioned = db.Tenant.Any();
result.Success = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -715,7 +715,7 @@ namespace Oqtane.Infrastructure
foreach (var upgrade in siteupgrades) foreach (var upgrade in siteupgrades)
{ {
var aliasname = upgrade.Key.Split(' ').First(); var aliasname = upgrade.Key.Split(' ').First();
// in the future this equality condition could use RegEx to allow for more flexible matching // in the future this equality condition could use RegEx to allow for more flexible matching
if (string.Equals(alias.Name, aliasname, StringComparison.OrdinalIgnoreCase)) if (string.Equals(alias.Name, aliasname, StringComparison.OrdinalIgnoreCase))
{ {
tenantManager.SetTenant(alias.TenantId); tenantManager.SetTenant(alias.TenantId);