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

Added suuport to inject an IOqtaneDatabase in EntityBuilders to allow each Database to control certain Migration behaviors. Also updated Installer to dynamically build Database Configuration section

Browse Source
This commit is contained in:
Charles Nurse
2021-03-27 11:16:16 -07:00
parent 3a032f401a
commit 2fb63e8117
74 changed files with 1028 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Oqtane.Server/Databases/Interfaces/IMultiDatabase.cs Normal file
View File

@ -0,0 +1,10 @@
using System.Collections.Generic;
using Oqtane.Interfaces;
namespace Oqtane.Repository.Databases.Interfaces
{
public interface IMultiDatabase
{
public IEnumerable<IOqtaneDatabase> Databases { get; }
}
}

36
Oqtane.Server/Databases/LocalDbDatabase.cs
View File

@ -1,16 +1,36 @@
using Microsoft.EntityFrameworkCore;
using Oqtane.Interfaces;
using System;
using System.Collections.Generic;
using Oqtane.Models;
using Oqtane.Repository.Databases;
namespace Oqtane.Repository.Databases
namespace Oqtane.Databases
{
public class LocalDbDatabase : IDatabase
public class LocalDbDatabase : SqlServerDatabaseBase
{
public string FriendlyName => "Local Database";
public string Name => "LocalDB";
private static string _friendlyName => "Local Database";
private static string _name => "LocalDB";
public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
private static readonly List<ConnectionStringField> _connectionStringFields = new()
{
return optionsBuilder.UseSqlServer(connectionString);
new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB"},
new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}"}
};
public LocalDbDatabase() :base(_name, _friendlyName, _connectionStringFields) { }
public override string BuildConnectionString()
{
var connectionString = String.Empty;
var server = ConnectionStringFields[0].Value;
var database = ConnectionStringFields[1].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
{
connectionString = $"Data Source={server};AttachDbFilename=|DataDirectory|\\{database}.mdf;Initial Catalog={database};Integrated Security=SSPI;";
}
return connectionString;
}
}
}

62
Oqtane.Server/Databases/SqlServerDatabase.cs
View File

@ -1,17 +1,61 @@
using Microsoft.EntityFrameworkCore;
using Oqtane.Interfaces;
using System;
using System.Collections.Generic;
using Oqtane.Models;
using Oqtane.Repository.Databases;
namespace Oqtane.Repository.Databases
// ReSharper disable ArrangeObjectCreationWhenTypeNotEvident
namespace Oqtane.Databases
{
public class SqlServerDatabase : IDatabase
public class SqlServerDatabase : SqlServerDatabaseBase
{
public string FriendlyName => "SQL Server";
private static string _friendlyName => "SQL Server";
private static string _name => "SqlServer";
public string Name => "SqlServer";
public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
private static readonly List<ConnectionStringField> _connectionStringFields = new()
{
return optionsBuilder.UseSqlServer(connectionString);
new() {Name = "Server", FriendlyName = "Server", Value = "."},
new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}"},
new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true"},
new() {Name = "Uid", FriendlyName = "User Id", Value = ""},
new() {Name = "Pwd", FriendlyName = "Password", Value = ""}
};
public SqlServerDatabase() :base(_name, _friendlyName, _connectionStringFields) { }
public override string BuildConnectionString()
{
var connectionString = String.Empty;
var server = ConnectionStringFields[0].Value;
var database = ConnectionStringFields[1].Value;
var integratedSecurity = Boolean.Parse(ConnectionStringFields[2].Value);
var userId = ConnectionStringFields[3].Value;
var password = ConnectionStringFields[4].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
{
connectionString = $"Data Source={server};Initial Catalog={database};";
}
if (integratedSecurity)
{
connectionString += "Integrated Security=SSPI;";
}
else
{
if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password))
{
connectionString += $"User ID={userId};Password={password};";
}
else
{
connectionString = String.Empty;
}
}
return connectionString;
}
}
}

39
Oqtane.Server/Databases/SqlServerDatabaseBase.cs Normal file
View File

@ -0,0 +1,39 @@
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Interfaces;
using Oqtane.Models;
namespace Oqtane.Repository.Databases
{
public abstract class SqlServerDatabaseBase : IOqtaneDatabase
{
protected SqlServerDatabaseBase(string name, string friendlyName, List<ConnectionStringField> connectionStringFields)
{
Name = name;
FriendlyName = friendlyName;
ConnectionStringFields = connectionStringFields;
}
public string FriendlyName { get; }
public string Name { get; }
public string Provider => "Microsoft.EntityFrameworkCore.SqlServer";
public List<ConnectionStringField> ConnectionStringFields { get; }
public OperationBuilder<AddColumnOperation> AddAutoIncrementColumn(ColumnsBuilder table, string name)
{
return table.Column<int>(name: name, nullable: false).Annotation("SqlServer:Identity", "1, 1");
}
public abstract string BuildConnectionString();
public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
{
return optionsBuilder.UseSqlServer(connectionString);
}
}
}

17
Oqtane.Server/Databases/SqliteDatabase.cs
View File

@ -1,17 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Oqtane.Interfaces;
namespace Oqtane.Repository.Databases
{
public class SqliteDatabase : IDatabase
{
public string FriendlyName => Name;
public string Name => "Sqlite";
public DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
{
return optionsBuilder.UseSqlite(connectionString);
}
}
}