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

Page IsClickable column must be nullable in order to support upgrades, add more defensive logic

Browse Source
This commit is contained in:
Shaun Walker
2021-06-24 07:41:34 -04:00
parent bfafffd8cb
commit 8e7b553ca8
6 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ using Oqtane.Repository;
using Oqtane.Shared;
using Oqtane.Enums;
using Newtonsoft.Json;
using System.Diagnostics;
// ReSharper disable MemberCanBePrivate.Global
// ReSharper disable ConvertToUsingDeclaration
@ -55,16 +56,25 @@ namespace Oqtane.Infrastructure
{
try
{
// verify master database contains a Tenant table ( ie. validate schema is properly provisioned )
var provisioned = db.Tenant.Any();
}
catch
catch (Exception ex)
{
result.Message = "Master Database Not Installed Correctly";
result.Message = "Master Database Not Installed Correctly. " + ex.Message;
}
}
else
else // cannot connect
{
result.Message = "Cannot Connect To Master Database";
try
{
// get the actual connection error details
db.Database.OpenConnection();
}
catch (Exception ex)
{
result.Message = "Cannot Connect To Master Database. " + ex.Message;
}
}
}
}
@ -127,6 +137,7 @@ namespace Oqtane.Infrastructure
{
if (!string.IsNullOrEmpty(installation.Message))
{
Debug.WriteLine($"Oqtane Error: {installation.Message}");
// problem with prior installation
install.ConnectionString = "";
}