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

Merge pull request #386 from chlupac/DBCreationBug

Browse Source 
Database creation bug
This commit is contained in:
Shaun Walker
2020-04-18 08:47:12 -04:00
committed by GitHub
parent 2dd2216aa2 69ceb5dd42
commit 50611582df
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,10 +348,10 @@ namespace Oqtane.Infrastructure
var user = new User var user = new User
{ {
SiteId = site.SiteId, SiteId = site.SiteId,
Username = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser), Username = Constants.HostUser,
Password = password, Password = password,
Email = email, Email = email,
DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser), DisplayName = Constants.HostUser,
}; };
CreateHostUser(folders, userRoles, roles, users, identityUserManager, user); CreateHostUser(folders, userRoles, roles, users, identityUserManager, user);
tenant.IsInitialized = true; tenant.IsInitialized = true;
@ -419,6 +419,7 @@ namespace Oqtane.Infrastructure
{ {
using (var db = new InstallationContext(connectionString)) using (var db = new InstallationContext(connectionString))
{ {
//check if DbUp was initialized //check if DbUp was initialized
return TableExists(db, "SchemaVersions"); return TableExists(db, "SchemaVersions");
} }
@ -431,6 +432,7 @@ namespace Oqtane.Infrastructure
public static bool TableExists(DbContext context, string schema, string tableName) public static bool TableExists(DbContext context, string schema, string tableName)
{ {
if (!context.Database.CanConnect()) return false;
var connection = context.Database.GetDbConnection(); var connection = context.Database.GetDbConnection();
if (connection.State.Equals(ConnectionState.Closed)) if (connection.State.Equals(ConnectionState.Closed))

2
Oqtane.Server/appsettings.json
View File

@ -2,9 +2,9 @@
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "" "DefaultConnection": ""
}, },
"Runtime" : "Server",
"Installation": { "Installation": {
"DefaultAlias": "", "DefaultAlias": "",
"HostUser": "",
"HostPassword": "", "HostPassword": "",
"HostEmail": "", "HostEmail": "",
"SiteTemplate": "", "SiteTemplate": "",