From 5b865c0442ddcb486f4df1db9dd89b02ee262814 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Tue, 4 Aug 2026 16:34:04 +0200
Subject: [PATCH] fix(sql): change query execution to use ToList before
 FirstOrDefault

- Change from FirstOrDefaultAsync to ToListAsync + FirstOrDefault
- Ensures proper query execution for both EF6 (.NET Framework 4.8) and EF Core (.NET 8.0)
- Prevents potential query execution issues
- Add using System.Linq directive
---
 ECMJobRunner.Infrastructure/Services/SQLExecutor.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ECMJobRunner.Infrastructure/Services/SQLExecutor.cs b/ECMJobRunner.Infrastructure/Services/SQLExecutor.cs
index b13170d..597c3c6 100644
--- a/ECMJobRunner.Infrastructure/Services/SQLExecutor.cs
+++ b/ECMJobRunner.Infrastructure/Services/SQLExecutor.cs
@@ -1,6 +1,5 @@
 #if NET48
 using System.Data.Entity;
-using System.Linq;
 #else
 using Microsoft.EntityFrameworkCore;
 #endif
@@ -8,6 +7,7 @@ using ECMJobRunner.Application.Common.Interfaces;
 using ECMJobRunner.Infrastructure.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Linq;
 
 namespace ECMJobRunner.Infrastructure.Services
 {
@@ -41,16 +41,16 @@ namespace ECMJobRunner.Infrastructure.Services
             // Entity Framework 6 implementation
             var result = await _context.Database
                 .SqlQuery<TResult>(sql)
-                .FirstOrDefaultAsync(cancellationToken);
-            
-            return result;
+                .ToListAsync(cancellationToken);
+
+            return result.FirstOrDefault();
 #else
             // Entity Framework Core implementation
             var result = await _context.Database
                 .SqlQueryRaw<TResult>(sql)
-                .FirstOrDefaultAsync(cancellationToken);
+                .ToListAsync(cancellationToken);
             
-            return result;
+            return result.FirstOrDefault();
 #endif
         }
     }