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

Remove dependency of Oqtane.Server on SqlClient

Browse Source
This commit is contained in:
Charles Nurse 2021-05-11 13:56:49 -07:00
parent efe803f147
commit 4ffdcf1e52
13 changed files with 223 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Oqtane.Database.MySQL/MySQLDatabase.cs
View File

@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using MySql.Data.MySqlClient;
using MySql.EntityFrameworkCore.Metadata;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Database.MySQL
@ -41,10 +40,52 @@ namespace Oqtane.Database.MySQL
return returnValue;
}
public override int ExecuteNonQuery(string connectionString, string query)
{
var conn = new MySqlConnection(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 MySqlConnection(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.UseMySQL(connectionString);
}
private void PrepareCommand(MySqlConnection conn, MySqlCommand cmd, string query)
{
if (conn.State != ConnectionState.Open)
{
conn.Open();
}
cmd.Connection = conn;
cmd.CommandText = query;
cmd.CommandType = CommandType.Text;
}
}
}

47
Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs
View File

@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Globalization;
using EFCore.NamingConventions.Internal;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Models;
using Npgsql;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Oqtane.Shared;
@ -47,6 +46,36 @@ namespace Oqtane.Database.PostgreSQL
return returnValue;
}
public override int ExecuteNonQuery(string connectionString, string query)
{
var conn = new NpgsqlConnection(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 NpgsqlConnection(connectionString);
var cmd = conn.CreateCommand();
PrepareCommand(conn, cmd, query);
var dr = cmd.ExecuteReader(CommandBehavior.CloseConnection);
return dr;
}
public override string RewriteName(string name)
{
return _rewriter.RewriteName(name);
@ -85,5 +114,17 @@ namespace Oqtane.Database.PostgreSQL
{
return optionsBuilder.UseNpgsql(connectionString).UseSnakeCaseNamingConvention();
}
private void PrepareCommand(NpgsqlConnection conn, NpgsqlCommand cmd, string query)
{
if (conn.State != ConnectionState.Open)
{
conn.Open();
}
cmd.Connection = conn;
cmd.CommandText = query;
cmd.CommandType = CommandType.Text;
}
}
}

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

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using Oqtane.Models;
namespace Oqtane.Repository.Databases
namespace Oqtane.Database.SqlServer
{
public class LocalDbDatabase : SqlServerDatabaseBase
{

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

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using Oqtane.Models;
namespace Oqtane.Repository.Databases
namespace Oqtane.Database.SqlServer
{
public class SqlServerDatabase : SqlServerDatabaseBase
{

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

@ -1,11 +1,12 @@
using System.Collections.Generic;
using System;
using System.Data;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Repository.Databases
namespace Oqtane.Database.SqlServer
{
public abstract class SqlServerDatabaseBase : OqtaneDatabaseBase
{
@ -20,9 +21,55 @@ namespace Oqtane.Repository.Databases
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;
}
}
}

47
Oqtane.Database.Sqlite/SqliteDatabase.cs
View File

@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Repository.Databases
namespace Oqtane.Database.Sqlite
{
public class SqliteDatabase : OqtaneDatabaseBase
{
@ -38,9 +38,50 @@ namespace Oqtane.Repository.Databases
return returnValue;
}
public override int ExecuteNonQuery(string connectionString, string query)
{
var conn = new SqliteConnection(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 SqliteConnection(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.UseSqlite(connectionString);
}
private void PrepareCommand(SqliteConnection conn, SqliteCommand cmd, string query)
{
if (conn.State != ConnectionState.Open)
{
conn.Open();
}
cmd.Connection = conn;
cmd.CommandText = query;
cmd.CommandType = CommandType.Text;
}
}
}

4
Oqtane.Server/Controllers/SqlController.cs
View File

@ -7,7 +7,7 @@ using Oqtane.Infrastructure;
using Oqtane.Repository;
using Oqtane.Enums;
using System;
using Microsoft.Data.SqlClient;
using System.Data;
namespace Oqtane.Controllers
{
@ -37,7 +37,7 @@ namespace Oqtane.Controllers
{
foreach (string query in sqlquery.Query.Split("GO", StringSplitOptions.RemoveEmptyEntries))
{
SqlDataReader dr = _sql.ExecuteReader(tenant, query);
IDataReader dr = _sql.ExecuteReader(tenant, query);
_logger.Log(LogLevel.Information, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId}", query, sqlquery.TenantId);
while (dr.Read())
{

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

@ -232,7 +232,7 @@ namespace Oqtane.Infrastructure
var installation = IsInstalled();
if (installation.Success && (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB"))
{
UpgradeSqlServer(sql, install.ConnectionString, true);
UpgradeSqlServer(sql, install.ConnectionString, install.DatabaseType, true);
}
// Push latest model into database
masterDbContext.Database.Migrate();
@ -344,9 +344,9 @@ namespace Oqtane.Infrastructure
var dbConfig = new DbConfig(null, null, databases) {ConnectionString = tenant.DBConnectionString, DatabaseType = tenant.DBType};
using (var tenantDbContext = new TenantDBContext(dbConfig, null))
{
if (install.DatabaseType == "SqlServer" || install.DatabaseType == "LocalDB")
if (dbConfig.DatabaseType == "SqlServer" || dbConfig.DatabaseType == "LocalDB")
{
UpgradeSqlServer(sql, tenant.DBConnectionString, false);
UpgradeSqlServer(sql, tenant.DBConnectionString, tenant.DBType, false);
}
// Push latest model into database
@ -649,11 +649,11 @@ namespace Oqtane.Infrastructure
_config.Reload();
}
public void UpgradeSqlServer(ISqlRepository sql, string connectionString, bool isMaster)
public void UpgradeSqlServer(ISqlRepository sql, string connectionString, string databaseType, bool isMaster)
{
var script = (isMaster) ? "MigrateMaster.sql" : "MigrateTenant.sql";
sql.ExecuteScript(connectionString, Assembly.GetExecutingAssembly(), script);
sql.ExecuteScript(connectionString, databaseType, Assembly.GetExecutingAssembly(), script);
}
}
}

1
Oqtane.Server/Oqtane.Server.csproj
View File

@ -32,7 +32,6 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
<PrivateAssets>all</PrivateAssets>

8
Oqtane.Server/Repository/Interfaces/ISqlRepository.cs
View File

@ -1,5 +1,5 @@
using System.Reflection;
using Microsoft.Data.SqlClient;
using System.Data;
using System.Reflection;
using Oqtane.Models;
namespace Oqtane.Repository
@ -8,12 +8,12 @@ namespace Oqtane.Repository
{
void ExecuteScript(Tenant tenant, string script);
bool ExecuteScript(string connectionString, Assembly assembly, string filename);
bool ExecuteScript(string connectionString, string databaseType, Assembly assembly, string filename);
bool ExecuteScript(Tenant tenant, Assembly assembly, string filename);
int ExecuteNonQuery(Tenant tenant, string query);
SqlDataReader ExecuteReader(Tenant tenant, string query);
IDataReader ExecuteReader(Tenant tenant, string query);
}
}

61
Oqtane.Server/Repository/SqlRepository.cs
View File

@ -1,9 +1,10 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.Data.SqlClient;
using Oqtane.Interfaces;
using Oqtane.Models;
// ReSharper disable ConvertToUsingDeclaration
// ReSharper disable InvertIf
@ -13,6 +14,12 @@ namespace Oqtane.Repository
{
public class SqlRepository : ISqlRepository
{
private IEnumerable<IOqtaneDatabase> _databases;
public SqlRepository(IEnumerable<IOqtaneDatabase> databases)
{
_databases = databases;
}
public void ExecuteScript(Tenant tenant, string script)
{
@ -23,7 +30,7 @@ namespace Oqtane.Repository
}
}
public bool ExecuteScript(string connectionString, Assembly assembly, string fileName)
public bool ExecuteScript(string connectionString, string databaseType, Assembly assembly, string fileName)
{
var success = true;
var script = GetScriptFromAssembly(assembly, fileName);
@ -34,7 +41,7 @@ namespace Oqtane.Repository
{
foreach (var query in script.Split("GO", StringSplitOptions.RemoveEmptyEntries))
{
ExecuteNonQuery(connectionString, query);
ExecuteNonQuery(connectionString, databaseType, query);
}
}
catch
@ -68,36 +75,20 @@ namespace Oqtane.Repository
public int ExecuteNonQuery(Tenant tenant, string query)
{
return ExecuteNonQuery(tenant.DBConnectionString, query);
return ExecuteNonQuery(tenant.DBConnectionString, tenant.DBType, query);
}
public SqlDataReader ExecuteReader(Tenant tenant, string query)
public IDataReader ExecuteReader(Tenant tenant, string query)
{
SqlConnection conn = new SqlConnection(FormatConnectionString(tenant.DBConnectionString));
SqlCommand cmd = conn.CreateCommand();
PrepareCommand(conn, cmd, query);
var dr = cmd.ExecuteReader(CommandBehavior.CloseConnection);
return dr;
var db = _databases.Single(d => d.Name == tenant.DBType);
return db.ExecuteReader(tenant.DBConnectionString, query);
}
private int ExecuteNonQuery(string connectionString, string query)
private int ExecuteNonQuery(string connectionString, string databaseType, 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;
}
var db = _databases.Single(d => d.Name == databaseType);
return db.ExecuteNonQuery(connectionString, query);
}
private string GetScriptFromAssembly(Assembly assembly, string fileName)
@ -123,21 +114,5 @@ namespace Oqtane.Repository
return script;
}
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;
}
private string FormatConnectionString(string connectionString)
{
return connectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
}
}
}

5
Oqtane.Shared/Interfaces/IOqtaneDatabase.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
@ -18,6 +19,10 @@ namespace Oqtane.Interfaces
public string ConcatenateSql(params string[] values);
public int ExecuteNonQuery(string connectionString, string query);
public IDataReader ExecuteReader(string connectionString, string query);
public string RewriteName(string name);
public void UpdateIdentityStoreTableNames(ModelBuilder builder);

5
Oqtane.Shared/Shared/OqtaneDatabaseBase.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
@ -39,6 +40,10 @@ namespace Oqtane.Shared
return returnValue;
}
public abstract int ExecuteNonQuery(string connectionString, string query);
public abstract IDataReader ExecuteReader(string connectionString, string query);
public virtual string RewriteName(string name)
{
return name;