kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/cnurse/oqtane.framework into dev

Browse Source 
# Conflicts:
#	Oqtane.Server/Infrastructure/DatabaseManager.cs
This commit is contained in:
Charles Nurse 2021-05-24 15:47:02 -07:00
commit a62a1be1f3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,6 @@ namespace Oqtane.Infrastructure
{ {
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>(); var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
installationManager.InstallPackages(); installationManager.InstallPackages();
result.Success = true;
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
var assembliesFolder = new DirectoryInfo(assemblyPath); var assembliesFolder = new DirectoryInfo(assemblyPath);
@ -411,7 +410,7 @@ namespace Oqtane.Infrastructure
{ {
using (var tenantDbContext = new TenantDBContext(tenantManager, null)) 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); UpgradeSqlServer(sql, tenant.DBConnectionString, tenant.DBType, false);
} }

2
Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs
View File

@ -25,7 +25,7 @@ namespace Oqtane.Migrations
//Update new column if SqlServer (Other Databases will not have any records yet) //Update new column if SqlServer (Other Databases will not have any records yet)
if (ActiveDatabase.Name == "SqlServer") if (ActiveDatabase.Name == "SqlServer")
{ {
tenantEntityBuilder.UpdateColumn("DBType", ActiveDatabase.TypeName); tenantEntityBuilder.UpdateColumn("DBType", $"'{ActiveDatabase.TypeName}'");
} }
} }
} }