From 144178a504a84dc45a8fe729f887fb59b45ac524 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Thu, 18 Dec 2025 21:54:22 +0100 Subject: [PATCH 1/6] Add async SQL execution methods to DbRepository Added `ExecuteSqlRawAsync` and `ExecuteSqlInterpolatedAsync` methods to the `DbRepository` class for asynchronous SQL execution. Updated the `System.Linq` namespace import to support LINQ operations. Simplified conditional compilation directives by consistently enclosing the class declaration in braces `{}` across frameworks. Adjusted closing braces to align with the updated structure. --- .../DbRepository.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/DigitalData.Core.Infrastructure/DbRepository.cs b/DigitalData.Core.Infrastructure/DbRepository.cs index 6771a73..7d559ed 100644 --- a/DigitalData.Core.Infrastructure/DbRepository.cs +++ b/DigitalData.Core.Infrastructure/DbRepository.cs @@ -13,12 +13,7 @@ using System.Threading.Tasks; #endif namespace DigitalData.Core.Infrastructure -#if NET - ; -#elif NETFRAMEWORK - { -#endif - +{ public class DbRepository where TDbContext : DbContext { protected internal readonly TDbContext Context; @@ -28,6 +23,16 @@ namespace DigitalData.Core.Infrastructure Context = context; } + public Task ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default) + { + return Context.Database.ExecuteSqlRawAsync(sql, parameters, cancel); + } + + public Task ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default) + { + return Context.Database.ExecuteSqlInterpolatedAsync(sql, cancel); + } + public int ExecuteSqlRaw([NotParameterized] string sql, params object[] parameters) { return Context.Database.ExecuteSqlRaw(sql, parameters); @@ -155,6 +160,4 @@ namespace DigitalData.Core.Infrastructure public virtual IQueryable ReadOnly() => Entities.AsNoTracking(); #endregion } -#if NETFRAMEWORK - } -#endif \ No newline at end of file +} \ No newline at end of file From 5c3db6886a47b98679a2bcb5c7fb3a9b29d102eb Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Thu, 18 Dec 2025 22:09:45 +0100 Subject: [PATCH 2/6] Add EF Core support and refactor IRepository interface Updated project dependencies to include `Microsoft.EntityFrameworkCore.Abstractions` for multiple target frameworks (`net462`, `net7.0`, `net8.0`, `net9.0`). Added `Microsoft.Extensions.*` package references to the project file. Enhanced `IRepository` interface with methods for executing raw and interpolated SQL queries (`ExecuteSqlRawAsync`, `ExecuteSqlInterpolatedAsync`, etc.). Adjusted method declarations to support conditional compilation for `NET` and `NETFRAMEWORK`. Refactored namespace structure in `IRepository.cs` to simplify and remove unnecessary conditional compilation directives. --- ...alData.Core.Abstraction.Application.csproj | 6 +++- .../Repository/IRepository.cs | 29 +++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj b/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj index bdd0f55..5c57408 100644 --- a/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj +++ b/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj @@ -37,7 +37,7 @@ enable latest - + @@ -52,24 +52,28 @@ + + + + diff --git a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs index 5433e71..200032d 100644 --- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs +++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs @@ -1,4 +1,5 @@ using System.Linq.Expressions; +using Microsoft.EntityFrameworkCore.Query; #if NETFRAMEWORK using System; using System.Collections.Generic; @@ -8,11 +9,29 @@ using System.Linq; #endif namespace DigitalData.Core.Abstraction.Application.Repository -#if NET - ; -#elif NETFRAMEWORK +{ + public interface IRepository { +#if NET + public +#endif + Task ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default); + +#if NET + public +#endif + Task ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default); + +#if NET + public #endif + int ExecuteSqlRaw([NotParameterized] string sql, params object[] parameters); + +#if NET + public +#endif + int ExecuteSqlInterpolated(FormattableString sql); + } public interface IRepository { @@ -108,6 +127,4 @@ namespace DigitalData.Core.Abstraction.Application.Repository IQueryable ReadOnly(); #endregion } -#if NETFRAMEWORK - } -#endif \ No newline at end of file +} \ No newline at end of file From ce5c59dfc27048d7166d09efa40e34bbc301c8cc Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 19 Dec 2025 08:57:18 +0100 Subject: [PATCH 3/6] Update DbRepository to require IRepository constraint The `DbRepository` class now enforces that the generic type parameter `TDbContext` must implement the `IRepository` interface in addition to inheriting from `DbContext`. This ensures that `DbRepository` can leverage functionality provided by the `IRepository` interface, improving type safety and consistency. --- DigitalData.Core.Infrastructure/DbRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalData.Core.Infrastructure/DbRepository.cs b/DigitalData.Core.Infrastructure/DbRepository.cs index 7d559ed..4e8daeb 100644 --- a/DigitalData.Core.Infrastructure/DbRepository.cs +++ b/DigitalData.Core.Infrastructure/DbRepository.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace DigitalData.Core.Infrastructure { - public class DbRepository where TDbContext : DbContext + public class DbRepository where TDbContext : DbContext, IRepository { protected internal readonly TDbContext Context; From 82686db38b74549086f6f14e33d826ac267617a0 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 19 Dec 2025 09:05:59 +0100 Subject: [PATCH 4/6] Add QueryRaw and QueryInterpolated methods to repository Added `QueryRaw` and `QueryInterpolated` methods to the `IRepository` interface for raw and interpolated SQL queries, conditionally compiled for the `NET` target framework. Removed the `Sql` method from `DbRepository` and replaced it with implementations of `QueryRaw` and `QueryInterpolated` using `Entities.FromSqlRaw` and `Entities.FromSqlInterpolated`. Updated the `Query` property in `DbRepository` to use `Entities.AsNoTracking()` for read-only queries. --- .../Repository/IRepository.cs | 10 ++++++++++ DigitalData.Core.Infrastructure/DbRepository.cs | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs index 200032d..161c98f 100644 --- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs +++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs @@ -63,6 +63,16 @@ namespace DigitalData.Core.Abstraction.Application.Repository #endif IQueryable Query { get; } +#if NET + public +#endif + IQueryable QueryRaw([NotParameterized] string sql, params object[] parameters); + +#if NET + public +#endif + IQueryable QueryInterpolated([NotParameterized] FormattableString sql); + #if NET public #endif diff --git a/DigitalData.Core.Infrastructure/DbRepository.cs b/DigitalData.Core.Infrastructure/DbRepository.cs index 4e8daeb..9043d65 100644 --- a/DigitalData.Core.Infrastructure/DbRepository.cs +++ b/DigitalData.Core.Infrastructure/DbRepository.cs @@ -67,11 +67,6 @@ namespace DigitalData.Core.Infrastructure Mapper = mapper; } - public IQueryable Sql([NotParameterized] string sql, params object[] parameters) - { - return Entities.FromSqlRaw(sql, parameters); - } - #region Create public virtual async Task CreateAsync(TEntity entity, CancellationToken cancel = default) { @@ -105,6 +100,10 @@ namespace DigitalData.Core.Infrastructure #region Read public virtual IQueryable Query => Entities.AsNoTracking(); + public IQueryable QueryRaw([NotParameterized] string sql, params object[] parameters) => Entities.FromSqlRaw(sql, parameters); + + public IQueryable QueryInterpolated([NotParameterized] FormattableString sql) => Entities.FromSqlInterpolated(sql); + public virtual IQueryable Where(Expression> expression) => Entities.AsNoTracking().Where(expression); public virtual IEnumerable GetAll() => Entities.AsNoTracking().ToList(); From 42c0dc72062cbfa21fb6f495d4418d6ac7c954b3 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 19 Dec 2025 09:20:18 +0100 Subject: [PATCH 5/6] Refactor method names for clarity in IRepository/DbRepository Renamed methods in `IRepository` and `DbRepository` to replace `Sql` with `Query` for improved clarity and consistency. - Updated `IRepository` methods: - `ExecuteSqlRawAsync` -> `ExecuteQueryRawAsync` - `ExecuteSqlInterpolatedAsync` -> `ExecuteQueryInterpolatedAsync` - `ExecuteSqlRaw` -> `ExecuteQueryRaw` - `ExecuteSqlInterpolated` -> `ExecuteQueryInterpolated` - Updated `DbRepository` methods: - `ExecuteSqlRawAsync` -> `ExecuteQueryRawAsync` - `ExecuteSqlInterpolatedAsync` -> `ExecuteQueryInterpolatedAsync` - `ExecuteSqlRaw` -> `ExecuteQueryRaw` - `ExecuteSqlInterpolated` -> `ExecuteQueryInterpolated` - Fixed `DbRepository` class declaration by removing the incorrect constraint requiring `TDbContext` to implement `IRepository`. --- .../Repository/IRepository.cs | 8 ++++---- DigitalData.Core.Infrastructure/DbRepository.cs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs index 161c98f..6c40c12 100644 --- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs +++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs @@ -15,22 +15,22 @@ namespace DigitalData.Core.Abstraction.Application.Repository #if NET public #endif - Task ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default); + Task ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default); #if NET public #endif - Task ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default); + Task ExecuteQueryInterpolatedAsync(FormattableString sql, CancellationToken cancel = default); #if NET public #endif - int ExecuteSqlRaw([NotParameterized] string sql, params object[] parameters); + int ExecuteQueryRaw([NotParameterized] string sql, params object[] parameters); #if NET public #endif - int ExecuteSqlInterpolated(FormattableString sql); + int ExecuteQueryInterpolated(FormattableString sql); } public interface IRepository diff --git a/DigitalData.Core.Infrastructure/DbRepository.cs b/DigitalData.Core.Infrastructure/DbRepository.cs index 9043d65..b95be53 100644 --- a/DigitalData.Core.Infrastructure/DbRepository.cs +++ b/DigitalData.Core.Infrastructure/DbRepository.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace DigitalData.Core.Infrastructure { - public class DbRepository where TDbContext : DbContext, IRepository + public class DbRepository : IRepository where TDbContext : DbContext { protected internal readonly TDbContext Context; @@ -23,22 +23,22 @@ namespace DigitalData.Core.Infrastructure Context = context; } - public Task ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default) + public Task ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable parameters, CancellationToken cancel = default) { return Context.Database.ExecuteSqlRawAsync(sql, parameters, cancel); } - public Task ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default) + public Task ExecuteQueryInterpolatedAsync(FormattableString sql, CancellationToken cancel = default) { return Context.Database.ExecuteSqlInterpolatedAsync(sql, cancel); } - public int ExecuteSqlRaw([NotParameterized] string sql, params object[] parameters) + public int ExecuteQueryRaw([NotParameterized] string sql, params object[] parameters) { return Context.Database.ExecuteSqlRaw(sql, parameters); } - public int ExecuteSqlInterpolated(FormattableString sql) + public int ExecuteQueryInterpolated(FormattableString sql) { return Context.Database.ExecuteSqlInterpolated(sql); } From d2302560f1bf0c6f2e462ea23e116a5f56d696c1 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Fri, 19 Dec 2025 09:25:58 +0100 Subject: [PATCH 6/6] Add repository registration to DependencyInjection Added a `RegsRepository` queue to manage repository registrations. Introduced `RegisterDefaultRepository()` to enqueue scoped repository registrations. Updated `RegisterAllServices` to process the `RegsRepository` queue during service registration. --- DigitalData.Core.Infrastructure/DependencyInjection.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DigitalData.Core.Infrastructure/DependencyInjection.cs b/DigitalData.Core.Infrastructure/DependencyInjection.cs index 1acd7b9..d188058 100644 --- a/DigitalData.Core.Infrastructure/DependencyInjection.cs +++ b/DigitalData.Core.Infrastructure/DependencyInjection.cs @@ -40,6 +40,9 @@ public static class DependencyInjection // 3. register db set factories (can overwrite) private readonly Queue> RegsDbSetFactory = new Queue>(); + // 4. register repository + private readonly Queue> RegsRepository = new Queue>(); + internal void RegisterAllServices(IServiceCollection services) { // 1. register from assembly @@ -113,6 +116,11 @@ public static class DependencyInjection where TDbContext : DbContext where TEntity : class => RegsDbSetFactory.Enqueue(s => s.AddDbSetFactory(dbSetFactory)); + + public void RegisterDefaultRepository() + where TDbContext : DbContext + where TEntity : class + => RegsRepository.Enqueue(s => s.AddScoped, DbRepository>()); } private static void InvokeAll(this Queue> queue, T services)