diff --git a/Oqtane.Database.MySQL/MySQLDatabase.cs b/Oqtane.Database.MySQL/MySQLDatabase.cs index 1998d7b8..4082de1f 100644 --- a/Oqtane.Database.MySQL/MySQLDatabase.cs +++ b/Oqtane.Database.MySQL/MySQLDatabase.cs @@ -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; + } } } diff --git a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs index d3284232..9d0abbe5 100644 --- a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs +++ b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs @@ -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; + } } } diff --git a/Oqtane.Database.SqlServer/LocalDbDatabase.cs b/Oqtane.Database.SqlServer/LocalDbDatabase.cs index 5ad80798..d9c86ad3 100644 --- a/Oqtane.Database.SqlServer/LocalDbDatabase.cs +++ b/Oqtane.Database.SqlServer/LocalDbDatabase.cs @@ -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 { diff --git a/Oqtane.Database.SqlServer/SqlServerDatabase.cs b/Oqtane.Database.SqlServer/SqlServerDatabase.cs index a3c07d44..1e56ee72 100644 --- a/Oqtane.Database.SqlServer/SqlServerDatabase.cs +++ b/Oqtane.Database.SqlServer/SqlServerDatabase.cs @@ -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 { diff --git a/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs b/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs index a21966c0..93fa1044 100644 --- a/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs +++ b/Oqtane.Database.SqlServer/SqlServerDatabaseBase.cs @@ -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(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; + } } } diff --git a/Oqtane.Database.Sqlite/SqliteDatabase.cs b/Oqtane.Database.Sqlite/SqliteDatabase.cs index 655e6cdb..26cd520e 100644 --- a/Oqtane.Database.Sqlite/SqliteDatabase.cs +++ b/Oqtane.Database.Sqlite/SqliteDatabase.cs @@ -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; + } } } diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs index 7e24f041..16df8935 100644 --- a/Oqtane.Server/Controllers/SqlController.cs +++ b/Oqtane.Server/Controllers/SqlController.cs @@ -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()) { diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index e70826ad..3967c059 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -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); } } } diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 879ac2eb..72f56074 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -32,7 +32,6 @@ - all diff --git a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs index 4d53fce6..ca4b1128 100644 --- a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs @@ -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); } } diff --git a/Oqtane.Server/Repository/SqlRepository.cs b/Oqtane.Server/Repository/SqlRepository.cs index 6a35876a..ad87ae3d 100644 --- a/Oqtane.Server/Repository/SqlRepository.cs +++ b/Oqtane.Server/Repository/SqlRepository.cs @@ -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 _databases; + + public SqlRepository(IEnumerable 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()); - } } } diff --git a/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs b/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs index ac31a5f8..86bcba2a 100644 --- a/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs +++ b/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs @@ -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); diff --git a/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs b/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs index 5cbcc4bc..bf469b8e 100644 --- a/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs +++ b/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs @@ -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;