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

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