Refactored SqlServer's CreateFunction SqlGenerator-method

Author: stidsborg

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

@@ -115,15 +115,14 @@ DELETE FROM {tablePrefix}_effects
     }
 
     private string? _createFunctionSql;
-    public string CreateFunction(
+    public StoreCommand CreateFunction(
         StoredId storedId,
         FlowInstance humanInstanceId,
         byte[]? param,
         long leaseExpiration,
         long? postponeUntil,
         long timestamp,
         StoredId? parent,
-        SqlCommand command,
         string? paramPrefix)
     {
         _createFunctionSql ??= @$"
@@ -153,16 +152,17 @@ public string CreateFunction(
         if (paramPrefix != null)
             sql = sql.Replace("@", $"@{paramPrefix}");
 
-        command.Parameters.AddWithValue($"@{paramPrefix}FlowType", storedId.Type.Value);
-        command.Parameters.AddWithValue($"@{paramPrefix}FlowInstance", storedId.Instance.Value);
-        command.Parameters.AddWithValue($"@{paramPrefix}Status", (int)(postponeUntil == null ? Status.Executing : Status.Postponed));
-        command.Parameters.AddWithValue($"@{paramPrefix}ParamJson", param == null ? SqlBinary.Null : param);
-        command.Parameters.AddWithValue($"@{paramPrefix}Expires", postponeUntil ?? leaseExpiration);
-        command.Parameters.AddWithValue($"@{paramPrefix}HumanInstanceId", humanInstanceId.Value);
-        command.Parameters.AddWithValue($"@{paramPrefix}Timestamp", timestamp);
-        command.Parameters.AddWithValue($"@{paramPrefix}Parent", parent?.Serialize() ?? (object)DBNull.Value);
+        var command = new StoreCommand(sql);
+        command.AddParameter($"@{paramPrefix}FlowType", storedId.Type.Value);
+        command.AddParameter($"@{paramPrefix}FlowInstance", storedId.Instance.Value);
+        command.AddParameter($"@{paramPrefix}Status", (int)(postponeUntil == null ? Status.Executing : Status.Postponed));
+        command.AddParameter($"@{paramPrefix}ParamJson", param == null ? SqlBinary.Null : param);
+        command.AddParameter($"@{paramPrefix}Expires", postponeUntil ?? leaseExpiration);
+        command.AddParameter($"@{paramPrefix}HumanInstanceId", humanInstanceId.Value);
+        command.AddParameter($"@{paramPrefix}Timestamp", timestamp);
+        command.AddParameter($"@{paramPrefix}Parent", parent?.Serialize() ?? (object)DBNull.Value);
 
-        return sql;
+        return command;
     }
 
     private string? _succeedFunctionSql;

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

@@ -145,20 +145,18 @@ public async Task<bool> CreateFunction(
         await using var conn = await _connFunc();
 
         try
-        { 
-            await using var command = new SqlCommand();
-            command.Connection = conn;
-            command.CommandText = _sqlGenerator.CreateFunction(
-                storedId,
-                humanInstanceId,
-                param,
-                leaseExpiration,
-                postponeUntil,
-                timestamp,
-                parent,
-                command,
-                paramPrefix: null
-            );
+        {
+            await using var command = _sqlGenerator
+                .CreateFunction(
+                    storedId,
+                    humanInstanceId,
+                    param,
+                    leaseExpiration,
+                    postponeUntil,
+                    timestamp,
+                    parent,
+                    paramPrefix: null
+                ).ToSqlCommand(conn);
 
             await command.ExecuteNonQueryAsync();
         }