Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from 29.08.2023 #106

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ACCDataAdapter/ACCDataAdapter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
<PackageReference Include="Npgsql" Version="7.0.4" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
</ItemGroup>

Expand Down
20 changes: 10 additions & 10 deletions ACCDataAdapter/DPApp/BaseDAL.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ACCDataModel.DPApp;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using Npgsql;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -10,30 +10,30 @@ namespace ACCDataAdapter.DPApp
{
public abstract class BaseDAL
{

// TODO: Überschreiben zu Pgsql
protected string ConnectionString { get; set; }

public BaseDAL(string connectionString)
{
ConnectionString = connectionString;
}

protected async Task<SqlConnection> GetSqlConnectionAsync(CancellationToken cancellationToken = default)
protected async Task<NpgsqlConnection> GetSqlConnectionAsync(CancellationToken cancellationToken = default)
{
SqlConnection connection;
NpgsqlConnection connection;

connection = new SqlConnection(ConnectionString);
connection = new NpgsqlConnection(ConnectionString);
await connection.OpenAsync(cancellationToken);

return connection;
}

protected async Task<SqlDataReader> CreateReaderFromCommandAsync(SqlCommand cmd, CancellationToken cancellationToken = default)
protected async Task<NpgsqlDataReader> CreateReaderFromCommandAsync(NpgsqlCommand cmd, CancellationToken cancellationToken = default)
{

cmd.Connection = await GetSqlConnectionAsync(cancellationToken);

SqlDataReader rdr = await cmd.ExecuteReaderAsync(cancellationToken);
NpgsqlDataReader rdr = await cmd.ExecuteReaderAsync(cancellationToken);
return rdr;

}
Expand All @@ -43,14 +43,14 @@ protected async Task<IEnumerable<T>> ReadDPAppObjectAsync<T>(string commandText,

List<T> listObjects = new();

using (SqlConnection connection = await GetSqlConnectionAsync(cancellationToken))
using (NpgsqlConnection connection = await GetSqlConnectionAsync(cancellationToken))
{

using (SqlCommand cmd = new(commandText, connection))
using (NpgsqlCommand cmd = new(commandText, connection))
{
cmd.CommandType = CommandType.Text;

using SqlDataReader reader = await cmd.ExecuteReaderAsync(cancellationToken);
using NpgsqlDataReader reader = await cmd.ExecuteReaderAsync(cancellationToken);

while (await reader.ReadAsync(cancellationToken))
{
Expand Down
5 changes: 3 additions & 2 deletions ACCDataAdapter/DPApp/MasterdataDAL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
using ACCDataModel.DPApp;
using Npgsql;

namespace ACCDataAdapter.DPApp
{
Expand All @@ -19,12 +20,12 @@ public MasterdataDAL(string connectionString) : base(connectionString)
public async Task<DataTable> ReadCostCenterAsync(CancellationToken cancellationToken = default)
{

SqlCommand cmd = new(Properties.Resources.ReadCostCenters, await GetSqlConnectionAsync(cancellationToken))
NpgsqlCommand cmd = new(Properties.Resources.ReadCostCenters, await GetSqlConnectionAsync(cancellationToken))
{
CommandType = CommandType.Text
};

SqlDataAdapter da = new(cmd);
NpgsqlDataAdapter da = new(cmd);
DataSet ds = new();

da.Fill(ds);
Expand Down
4 changes: 2 additions & 2 deletions ACCDataAdapter/DPApp/ReadDPObjectFromReaderDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using ACCDataModel.DPApp;
using Npgsql;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ACCDataAdapter.DPApp
{
public delegate T ReadDPObjectFromReaderDelegate<T>(SqlDataReader reader) where T : DPAppObject;
public delegate T ReadDPObjectFromReaderDelegate<T>(NpgsqlDataReader reader) where T : DPAppObject;
}