Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3506 from sbwalker/dev

Browse Source 
remove InstallDatabase method as it is no longer required now that all database providers are installed automatically
This commit is contained in:
Shaun Walker 2023-11-22 16:10:03 -05:00 committed by GitHub
commit 73941ca30e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,12 +105,6 @@ namespace Oqtane.Infrastructure
IsNewTenant = false IsNewTenant = false
}; };
// on upgrade install the associated Nuget package
if (!string.IsNullOrEmpty(install.ConnectionString))
{
InstallDatabase(install);
}
var installation = IsInstalled(); var installation = IsInstalled();
if (!installation.Success) if (!installation.Success)
{ {
@ -209,32 +203,6 @@ namespace Oqtane.Infrastructure
return result; return result;
} }
private Installation InstallDatabase(InstallConfig install)
{
var result = new Installation {Success = false, Message = string.Empty};
try
{
// load the installation database type (if necessary)
//if (Type.GetType(install.DatabaseType) == null)
//{
// var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
// var assembliesFolder = new DirectoryInfo(assemblyPath);
// var assemblyFile = new FileInfo($"{assembliesFolder}/{Utilities.GetAssemblyName(install.DatabaseType)}.dll");
// AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
//}
result.Success = true;
}
catch (Exception ex)
{
result.Message = ex.ToString();
_filelogger.LogError(Utilities.LogMessage(this, result.Message));
}
return result;
}
private Installation CreateDatabase(InstallConfig install) private Installation CreateDatabase(InstallConfig install)
{ {
var result = new Installation { Success = false, Message = string.Empty }; var result = new Installation { Success = false, Message = string.Empty };
@ -243,8 +211,6 @@ namespace Oqtane.Infrastructure
{ {
try try
{ {
InstallDatabase(install);
var databaseType = install.DatabaseType; var databaseType = install.DatabaseType;
// get database type // get database type