Remove dependency of Oqtane.Server on SqlClient

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

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