Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 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
Download Patch File Download Diff File Expand all files Collapse all files

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());
}
}
}