Refactored SqlServer's SqlGenerator into instance-type

Author: stidsborg

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlGenerator.cs

@@ -11,17 +11,17 @@
 
 namespace Cleipnir.ResilientFunctions.SqlServer;
 
-internal static class SqlGenerator
+public class SqlGenerator(string tablePrefix)
 {
-    public static string Interrupt(IEnumerable<StoredId> storedIds, string tableName)
+    public string Interrupt(IEnumerable<StoredId> storedIds)
     {
         var conditionals = storedIds
             .GroupBy(id => id.Type.Value, id => id.Instance.Value)
             .Select(group => $"(FlowType = {group.Key} AND FlowInstance IN ({group.Select(i => $"'{i}'").StringJoin(", ")}))")
             .StringJoin(" OR ");
 
         var sql = @$"
-                UPDATE {tableName}
+                UPDATE {tablePrefix}
                 SET 
                     Interrupted = 1,
                     Status = 
@@ -40,7 +40,7 @@ ELSE Expires
         return sql;
     }
 
-    public static string UpdateEffects(SqlCommand command, IReadOnlyList<StoredEffectChange> changes, string tablePrefix, string paramPrefix)
+    public string UpdateEffects(SqlCommand command, IReadOnlyList<StoredEffectChange> changes, string paramPrefix)
     {
         var stringBuilder = new StringBuilder(capacity: 2);
         var upserts = changes

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerEffectsStore.cs

@@ -12,7 +12,7 @@
 
 namespace Cleipnir.ResilientFunctions.SqlServer;
 
-public class SqlServerEffectsStore(string connectionString, string tablePrefix = "") : IEffectsStore
+public class SqlServerEffectsStore(string connectionString, SqlGenerator sqlGenerator, string tablePrefix = "") : IEffectsStore
 {
     private string? _initializeSql;
     public async Task Initialize()
@@ -79,7 +79,7 @@ public async Task SetEffectResults(StoredId storedId, IReadOnlyList<StoredEffect
         await using var conn = await CreateConnection();
         await using var command = new SqlCommand();
         command.Connection = conn;
-        command.CommandText = SqlGenerator.UpdateEffects(command, changes, tablePrefix, paramPrefix: "");
+        command.CommandText = sqlGenerator.UpdateEffects(command, changes, paramPrefix: "");
 
         await command.ExecuteNonQueryAsync();
     }

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerFunctionStore.cs

@@ -36,16 +36,19 @@ public class SqlServerFunctionStore : IFunctionStore
     public ISemaphoreStore SemaphoreStore => _semaphoreStore;
 
     private readonly SqlServerUnderlyingRegister _underlyingRegister;
+    
+    private readonly SqlGenerator _sqlGenerator;
 
     public SqlServerFunctionStore(string connectionString, string tablePrefix = "")
     {
         _tableName = tablePrefix == "" ? "RFunctions" : tablePrefix;
+        _sqlGenerator = new SqlGenerator(_tableName);
 
         _connFunc = CreateConnection(connectionString);
-        _messageStore = new SqlServerMessageStore(connectionString, _tableName);
+        _messageStore = new SqlServerMessageStore(connectionString, _sqlGenerator, _tableName);
         _timeoutStore = new SqlServerTimeoutStore(connectionString, _tableName);
         _underlyingRegister = new SqlServerUnderlyingRegister(connectionString, _tableName);
-        _effectsStore = new SqlServerEffectsStore(connectionString, _tableName);
+        _effectsStore = new SqlServerEffectsStore(connectionString, _sqlGenerator, _tableName);
         _correlationStore = new SqlServerCorrelationsStore(connectionString, _tableName);
         _semaphoreStore = new SqlServerSemaphoreStore(connectionString, _tableName);
         _typeStore = new SqlServerTypeStore(connectionString, _tableName);
@@ -554,7 +557,7 @@ public async Task Interrupt(IEnumerable<StoredId> storedIds)
     {
         await using var conn = await _connFunc();
         await using var cmd = new SqlCommand(
-            SqlGenerator.Interrupt(storedIds, _tableName),
+            _sqlGenerator.Interrupt(storedIds),
             conn
         );
         await cmd.ExecuteNonQueryAsync();

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerMessageStore.cs

@@ -10,7 +10,7 @@
 
 namespace Cleipnir.ResilientFunctions.SqlServer;
 
-public class SqlServerMessageStore(string connectionString, string tablePrefix = "") : IMessageStore
+public class SqlServerMessageStore(string connectionString, SqlGenerator sqlGenerator, string tablePrefix = "") : IMessageStore
 {
     private string? _initializeSql;
     public async Task Initialize()
@@ -55,7 +55,7 @@ public async Task AppendMessages(IReadOnlyList<StoredIdAndMessage> messages, boo
             storedIds: messages.Select(msg => msg.StoredId).Distinct().ToList()
         );
         var storedIds = messages.Select(m => m.StoredId).Distinct();
-        var interuptsSql = SqlGenerator.Interrupt(storedIds, tablePrefix);
+        var interuptsSql = sqlGenerator.Interrupt(storedIds);
 
         await using var conn = await CreateConnection();
         var sql = @$"