From 42c0dc72062cbfa21fb6f495d4418d6ac7c954b3 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Fri, 19 Dec 2025 09:20:18 +0100
Subject: [PATCH] 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<int> ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default);
+        Task<int> ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default);
 
 #if NET
     public
 #endif
-        Task<int> ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default);
+        Task<int> 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<TEntity>
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<TDbContext> where TDbContext : DbContext, IRepository
+    public class DbRepository<TDbContext> : IRepository where TDbContext : DbContext
     {
         protected internal readonly TDbContext Context;
 
@@ -23,22 +23,22 @@ namespace DigitalData.Core.Infrastructure
             Context = context;
         }
 
-        public Task<int> ExecuteSqlRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default)
+        public Task<int> ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default)
         {
             return Context.Database.ExecuteSqlRawAsync(sql, parameters, cancel);
         }
 
-        public Task<int> ExecuteSqlInterpolatedAsync(FormattableString sql, CancellationToken cancel = default)
+        public Task<int> 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);
         }