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

Merge pull request #401 from chlupac/DatabaseManagerBug

Browse Source 
Create Data directoty if does not exists
This commit is contained in:
Shaun Walker
2020-04-26 13:21:42 -04:00
committed by GitHub
parent 9a7bde4357 a09be84824
commit 6d93fcfc1c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,10 @@ namespace Oqtane.Infrastructure
{ {
var defaultConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey); var defaultConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey);
var defaultAlias = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty); var defaultAlias = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty);
var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
//create data directory if does not exists
if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory);
// if no values specified, fallback to IDE installer // if no values specified, fallback to IDE installer
if (string.IsNullOrEmpty(defaultConnectionString)) if (string.IsNullOrEmpty(defaultConnectionString))
@ -61,7 +65,6 @@ namespace Oqtane.Infrastructure
if (result.Success) if (result.Success)
{ {
var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
WriteVersionInfo(defaultConnectionString); WriteVersionInfo(defaultConnectionString);
TenantMigration(defaultConnectionString, dataDirectory); TenantMigration(defaultConnectionString, dataDirectory);
} }
@ -69,7 +72,6 @@ namespace Oqtane.Infrastructure
if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString)) if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString))
{ {
BuildDefaultSite(password,email); BuildDefaultSite(password,email);
} }
} }
@ -210,7 +212,6 @@ namespace Oqtane.Infrastructure
private static void ModuleMigration(Assembly assembly, string connectionString) private static void ModuleMigration(Assembly assembly, string connectionString)
{ {
Console.WriteLine($"Migrating assembly {assembly.FullName}"); Console.WriteLine($"Migrating assembly {assembly.FullName}");
var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString) var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)
.WithScriptsEmbeddedInAssembly(assembly, s => !s.ToLower().Contains("uninstall.sql")); // scripts must be included as Embedded Resources .WithScriptsEmbeddedInAssembly(assembly, s => !s.ToLower().Contains("uninstall.sql")); // scripts must be included as Embedded Resources