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

Merge pull request #1397 from cnurse/dev

Browse Source 
Fix Upgrade issue with new componentized Database projects
This commit is contained in:
Shaun Walker 2021-05-25 07:39:24 -04:00 committed by GitHub
commit 7ec3376308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 133 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -19,5 +19,5 @@ Oqtane.Server/Data/*.db
/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
Oqtane.Server/Content
Oqtane.Server/wwwroot/Packages/**/assets.json
Oqtane.Server/wwwroot/Packages/*.log

15
Oqtane.Database.SqlServer/LocalDbDatabase.cs
View File

@ -1,15 +0,0 @@
namespace Oqtane.Database.SqlServer
{
public class LocalDbDatabase : SqlServerDatabaseBase
{
private static string _friendlyName => "Local Database";
private static string _name => "LocalDB";
static LocalDbDatabase()
{
Initialize(typeof(LocalDbDatabase));
}
public LocalDbDatabase() :base(_name, _friendlyName) { }
}
}

74
Oqtane.Database.SqlServer/SqlServerDatabase.cs
View File

@ -1,6 +1,16 @@
using System;
using System.Data;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases;
using Oqtane.Shared;
namespace Oqtane.Database.SqlServer
{
public class SqlServerDatabase : SqlServerDatabaseBase
public class SqlServerDatabase : DatabaseBase
{
private static string _friendlyName => "SQL Server";
@ -11,6 +21,66 @@ namespace Oqtane.Database.SqlServer
Initialize(typeof(SqlServerDatabase));
}
public SqlServerDatabase() : base(_name, _friendlyName) { }
public SqlServerDatabase() : base(_name, _friendlyName)
{
}
public override string Provider => "Microsoft.EntityFrameworkCore.SqlServer";
public override OperationBuilder<AddColumnOperation> AddAutoIncrementColumn(ColumnsBuilder table, string name)
{
return table.Column<int>(name: name, nullable: false).Annotation("SqlServer:Identity", "1, 1");
}
public override int ExecuteNonQuery(string connectionString, string query)
{
var conn = new SqlConnection(FormatConnectionString(connectionString));
var cmd = conn.CreateCommand();
using (conn)
{
PrepareCommand(conn, cmd, query);
var val = -1;
try
{
val = cmd.ExecuteNonQuery();
}
catch
{
// an error occurred executing the query
}
return val;
}
}
public override IDataReader ExecuteReader(string connectionString, string query)
{
var conn = new SqlConnection(FormatConnectionString(connectionString));
var cmd = conn.CreateCommand();
PrepareCommand(conn, cmd, query);
var dr = cmd.ExecuteReader(CommandBehavior.CloseConnection);
return dr;
}
public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
{
return optionsBuilder.UseSqlServer(connectionString);
}
private string FormatConnectionString(string connectionString)
{
return connectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
}
private void PrepareCommand(SqlConnection conn, SqlCommand cmd, string query)
{
if (conn.State != ConnectionState.Open)
{
conn.Open();
}
cmd.Connection = conn;
cmd.CommandText = query;
cmd.CommandType = CommandType.Text;
}
}
}

77
Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs
View File

@ -1,77 +0,0 @@
using System;
using System.Data;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases;
using Oqtane.Shared;
namespace Oqtane.Database.SqlServer
{
public abstract class SqlServerDatabaseBase : DatabaseBase
{
protected SqlServerDatabaseBase(string name, string friendlyName) : base(name, friendlyName)
{
}
public override string Provider => "Microsoft.EntityFrameworkCore.SqlServer";
public override OperationBuilder<AddColumnOperation> AddAutoIncrementColumn(ColumnsBuilder table, string name)
{
return table.Column<int>(name: name, nullable: false).Annotation("SqlServer:Identity", "1, 1");
}
public override int ExecuteNonQuery(string connectionString, string query)
{
var conn = new SqlConnection(FormatConnectionString(connectionString));
var cmd = conn.CreateCommand();
using (conn)
{
PrepareCommand(conn, cmd, query);
var val = -1;
try
{
val = cmd.ExecuteNonQuery();
}
catch
{
// an error occurred executing the query
}
return val;
}
}
public override IDataReader ExecuteReader(string connectionString, string query)
{
var conn = new SqlConnection(FormatConnectionString(connectionString));
var cmd = conn.CreateCommand();
PrepareCommand(conn, cmd, query);
var dr = cmd.ExecuteReader(CommandBehavior.CloseConnection);
return dr;
}
public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
{
return optionsBuilder.UseSqlServer(connectionString);
}
private string FormatConnectionString(string connectionString)
{
return connectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
}
private void PrepareCommand(SqlConnection conn, SqlCommand cmd, string query)
{
if (conn.State != ConnectionState.Open)
{
conn.Open();
}
cmd.Connection = conn;
cmd.CommandText = query;
cmd.CommandType = CommandType.Text;
}
}
}

2
Oqtane.Server/Controllers/DatabaseController.cs
View File

@ -20,7 +20,7 @@ namespace Oqtane.Controllers
Name = "LocalDB",
FriendlyName = "Local Database",
ControlType = "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
DBType = "Oqtane.Database.SqlServer.LocalDbDatabase, Oqtane.Database.SqlServer",
DBType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer",
Package = "Oqtane.Database.SqlServer"
},
new()

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

@ -47,9 +47,8 @@ namespace Oqtane.Infrastructure
if (!string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))
{
result.Success = true;
using (var scope = _serviceScopeFactory.CreateScope())
using (var db = GetInstallationContext())
{
var db = scope.ServiceProvider.GetRequiredService<MasterDBContext>();
if (db.Database.CanConnect())
{
try
@ -91,6 +90,15 @@ namespace Oqtane.Infrastructure
IsNewTenant = false
};
//If doing an Upgrade we may only have a connectionString. If that is the case - default databaseType to SqlServer
if (!string.IsNullOrEmpty(install.ConnectionString) && string.IsNullOrEmpty(install.DatabaseType))
{
install.DatabaseType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer";
install.DatabasePackage = "Oqtane.Database.SqlServer";
InstallDatabase(install);
UpdateDatabaseType(install.DatabaseType);
}
var installation = IsInstalled();
if (!installation.Success)
{
@ -183,29 +191,45 @@ namespace Oqtane.Infrastructure
try
{
//Rename bak extension
var packageFolderName = "Packages";
var webRootPath = _environment.WebRootPath;
var packagesFolder = new DirectoryInfo(Path.Combine(webRootPath, packageFolderName));
var databaseType = install.DatabaseType;
// iterate through Nuget packages in source folder
foreach (var package in packagesFolder.GetFiles("*.nupkg.bak"))
//Get database Type
var type = Type.GetType(databaseType);
//Deploy the database components (if necessary)
if (type == null)
{
if (package.Name.StartsWith(install.DatabasePackage))
//Rename bak extension
var packageFolderName = "Packages";
var webRootPath = _environment.WebRootPath;
var packagesFolder = new DirectoryInfo(Path.Combine(webRootPath, packageFolderName));
// iterate through Nuget packages in source folder
foreach (var package in packagesFolder.GetFiles("*.nupkg.bak"))
{
//rename file
var packageName = Path.Combine(package.DirectoryName, package.Name);
packageName = packageName.Substring(0, packageName.IndexOf(".bak"));
package.MoveTo(packageName, true);
if (package.Name.StartsWith(install.DatabasePackage))
{
//rename file
var packageName = Path.Combine(package.DirectoryName, package.Name);
packageName = packageName.Substring(0, packageName.IndexOf(".bak"));
package.MoveTo(packageName, true);
}
}
}
//Call InstallationManager to install Database Package
using (var scope = _serviceScopeFactory.CreateScope())
{
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
installationManager.InstallPackages();
result.Success = true;
//Call InstallationManager to install Database Package
using (var scope = _serviceScopeFactory.CreateScope())
{
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
installationManager.InstallPackages();
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;
}
}
}
catch (Exception ex)
@ -224,24 +248,13 @@ namespace Oqtane.Infrastructure
{
try
{
InstallDatabase(install);
var databaseType = install.DatabaseType;
//Get database Type
var type = Type.GetType(databaseType);
//Deploy the database components (if necessary)
if (type == null)
{
InstallDatabase(install);
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
var assembliesFolder = new DirectoryInfo(assemblyPath);
var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll");
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
type = Type.GetType(databaseType);
}
//Create database object from Type
var database = Activator.CreateInstance(type) as IDatabase;
@ -288,7 +301,7 @@ namespace Oqtane.Infrastructure
using (var masterDbContext = new MasterDBContext(new DbContextOptions<MasterDBContext>(), null, _config))
{
if (installation.Success && (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB"))
if (installation.Success && (install.DatabaseType == "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"))
{
UpgradeSqlServer(sql, install.ConnectionString, install.DatabaseType, true);
}
@ -397,7 +410,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);
}

4
Oqtane.Server/Migrations/01000000_InitializeTenant.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Migrations
siteEntityBuilder.Create();
//Add Column to Site table (for Sql Server only) we will drop it later for Sql Server only
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
siteEntityBuilder.AddStringColumn("DefaultLayoutType", 200, true);
}
@ -35,7 +35,7 @@ namespace Oqtane.Migrations
pageEntityBuilder.AddIndex("IX_Page", new [] {"SiteId", "Path", "UserId"}, true);
//Add Columns to Page table (for Sql Server only) we will drop them later for Sql Server only
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
pageEntityBuilder.AddBooleanColumn("EditMode");
pageEntityBuilder.AddStringColumn("LayoutType", 200, true);

2
Oqtane.Server/Migrations/01000201_DropColumnFromPage.cs
View File

@ -19,7 +19,7 @@ namespace Oqtane.Migrations
protected override void Up(MigrationBuilder migrationBuilder)
{
//Drop Column from Page table
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
pageEntityBuilder.DropColumn("EditMode");

4
Oqtane.Server/Migrations/02000001_AddColumnToProfileAndUpdatePage.cs
View File

@ -26,7 +26,7 @@ namespace Oqtane.Migrations
profileEntityBuilder.UpdateColumn("Options", "''");
//Alter Column in Page table for Sql Server
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
pageEntityBuilder.DropIndex("IX_Page");
@ -42,7 +42,7 @@ namespace Oqtane.Migrations
profileEntityBuilder.DropColumn("Options");
//Alter Column in Page table
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
pageEntityBuilder.DropIndex("IX_Page");

2
Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs
View File

@ -18,7 +18,7 @@ namespace Oqtane.Migrations
protected override void Up(MigrationBuilder migrationBuilder)
{
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
//Update DefaultContainerType In Site
var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);

2
Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs
View File

@ -18,7 +18,7 @@ namespace Oqtane.Migrations
protected override void Up(MigrationBuilder migrationBuilder)
{
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
//Alter Column in Setting table for Sql Server
var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);

2
Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Migrations
appVersionsEntityBuilder.Create();
//Finish SqlServer Migration from DbUp
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
//Version 1.0.0
InsertVersion(migrationBuilder, "01.00.00", "Oqtane.Scripts.Master.00.09.00.00.sql");

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

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

2
Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs
View File

@ -26,7 +26,7 @@ namespace Oqtane.Migrations.EntityBuilders
{
PageId = AddAutoIncrementColumn(table,"PageId");
SiteId = AddIntegerColumn(table,"SiteId");
if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
if (ActiveDatabase.Name == "SqlServer")
{
Path = AddStringColumn(table,"Path", 50);
}

1
Oqtane.Server/wwwroot/Packages/Oqtane.Blogs.log
View File

@ -1 +0,0 @@
["C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Client.Oqtane.dll","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Client.Oqtane.pdb","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Server.Oqtane.dll","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Server.Oqtane.pdb","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Shared.Oqtane.dll","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Blogs.Shared.Oqtane.pdb","\\wwwroot\\Modules\\Oqtane.Blogs\\Module.css","\\wwwroot\\Modules\\Oqtane.Blogs\\Module.js"]

1
Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.log
View File

@ -1 +0,0 @@
["C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Database.SqlServer.dll","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Database.SqlServer.pdb","C:\\Users\\Shaun.Walker\\source\\repos\\sbwalker\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Microsoft.EntityFrameworkCore.SqlServer.dll"]

17
Oqtane.Test/Oqtane.Database.SqlServer/LocalDbDatabaseTests.cs
View File

@ -1,17 +0,0 @@
using Xunit;
namespace Oqtane.Database.SqlServer.Tests
{
public class LocalDbDatabaseTests
{
[Fact()]
public void VerifyDatabaseTypeName()
{
// Arrange & Act
var database = new LocalDbDatabase();
// Assert
Assert.Equal("Oqtane.Database.SqlServer.LocalDbDatabase, Oqtane.Database.SqlServer", database.TypeName);
}
}
}