From 69376c5baf29c2f47cf2df4da7ed6a8d98586b71 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 14:46:54 -0700 Subject: [PATCH 1/4] Missing files from previous commit --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 2 +- .../Migrations/02010001_AddDatabaseTypeColumnToTenant.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 087bee33..e328fcc8 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -411,7 +411,7 @@ namespace Oqtane.Infrastructure { using (var tenantDbContext = new TenantDBContext(tenantManager, null)) { - if (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB") + if (install.DatabaseType == "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer") { UpgradeSqlServer(sql, tenant.DBConnectionString, tenant.DBType, false); } diff --git a/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs b/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs index ca9a259f..32d84b49 100644 --- a/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs +++ b/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs @@ -25,7 +25,7 @@ namespace Oqtane.Migrations //Update new column if SqlServer (Other Databases will not have any records yet) if (ActiveDatabase.Name == "SqlServer") { - tenantEntityBuilder.UpdateColumn("DBType", ActiveDatabase.TypeName); + tenantEntityBuilder.UpdateColumn("DBType", $"'{ActiveDatabase.TypeName}'"); } } } From 4853a64cf9fb525b05da047fbb2bee759870ed8c Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 15:08:44 -0700 Subject: [PATCH 2/4] Fix conflict --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index e328fcc8..1f8e1235 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -221,7 +221,7 @@ namespace Oqtane.Infrastructure using (var scope = _serviceScopeFactory.CreateScope()) { var installationManager = scope.ServiceProvider.GetRequiredService(); - installationManager.InstallPackages(packageFolderName); + installationManager.InstallPackages(); result.Success = true; } @@ -231,7 +231,6 @@ namespace Oqtane.Infrastructure AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); } - } catch (Exception ex) { From 17f5f39a546de1e784806b52635d6df33e4b7b57 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 15:12:41 -0700 Subject: [PATCH 3/4] 2nd attempt to Fix conflict --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 1f8e1235..13bf85ff 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -223,13 +223,14 @@ namespace Oqtane.Infrastructure var installationManager = scope.ServiceProvider.GetRequiredService(); installationManager.InstallPackages(); result.Success = true; + + + var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); + var assembliesFolder = new DirectoryInfo(assemblyPath); + var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll"); + + AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); } - - var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); - var assembliesFolder = new DirectoryInfo(assemblyPath); - var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll"); - - AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); } } catch (Exception ex) From a0838cbc84b4668453ce564f2953406dd75e354b Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 15:14:58 -0700 Subject: [PATCH 4/4] 3rd attempt to resolve conflicts --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 13bf85ff..10e6a5fe 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -222,14 +222,14 @@ namespace Oqtane.Infrastructure { var installationManager = scope.ServiceProvider.GetRequiredService(); installationManager.InstallPackages(); - result.Success = true; - var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); var assembliesFolder = new DirectoryInfo(assemblyPath); var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll"); AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); + + result.Success = true; } } }