Using SqlGenerator for CreateFunction-method for Postgres

Author: stidsborg

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/PostgreSqlFunctionStore.cs

@@ -127,8 +127,7 @@ public async Task TruncateTables()
         await using var command = new NpgsqlCommand(_truncateTableSql, conn);
         await command.ExecuteNonQueryAsync();
     }
-
-    private string? _createFunctionSql;
+    
     public async Task<bool> CreateFunction(
         StoredId storedId,
         FlowInstance humanInstanceId,
@@ -139,28 +138,16 @@ public async Task<bool> CreateFunction(
         StoredId? parent)
     {
         await using var conn = await CreateConnection();
-        
-        _createFunctionSql ??= @$"
-            INSERT INTO {_tableName}
-                (type, instance, status, param_json, expires, timestamp, human_instance_id, parent)
-            VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8)
-            ON CONFLICT DO NOTHING;";
-        
-        await using var command = new NpgsqlCommand(_createFunctionSql, conn)
-        {
-            Parameters =
-            {
-                new() {Value = storedId.Type.Value},
-                new() {Value = storedId.Instance.Value},
-                new() {Value = (int) (postponeUntil == null ? Status.Executing : Status.Postponed)},
-                new() {Value = param == null ? DBNull.Value : param},
-                new() {Value = postponeUntil ?? leaseExpiration},
-                new() {Value = timestamp},
-                new() {Value = humanInstanceId.Value},
-                new() {Value = parent?.Serialize() ?? (object) DBNull.Value},
-            }
-        };
+
+        await using var command = _sqlGenerator.CreateFunction(
+            storedId,
+            humanInstanceId,
+            param,
+            leaseExpiration,
+            postponeUntil,
+            timestamp,
+            parent
+        ).ToNpgsqlCommand(conn);
 
         var affectedRows = await command.ExecuteNonQueryAsync();
         return affectedRows == 1;

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/PostgresCommand.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Npgsql;
+
+namespace Cleipnir.ResilientFunctions.PostgreSQL;
+
+public class PostgresCommand
+{
+    public required string Sql { get; init; }
+    public required List<object> Parameters { get; init; }
+
+    public NpgsqlCommand ToNpgsqlCommand(NpgsqlConnection conn)
+    {
+        var cmd = new NpgsqlCommand(Sql, conn);
+        foreach (var parameter in Parameters)
+            cmd.Parameters.Add(new NpgsqlParameter { Value = parameter });
+
+        return cmd;
+    }
+    
+    public NpgsqlBatchCommand ToNpgsqlBatchCommand()
+    {
+        var cmd = new NpgsqlBatchCommand(Sql);
+        foreach (var parameter in Parameters)
+            cmd.Parameters.Add(new NpgsqlParameter { Value = parameter });
+
+        return cmd;
+    }
+}

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/SqlGenerator.cs

@@ -91,4 +91,40 @@ ON CONFLICT (type, instance, id_hash)
 
        return commands;
    }
+    
+    private string? _createFunctionSql;
+    public PostgresCommand CreateFunction(
+        StoredId storedId,
+        FlowInstance humanInstanceId,
+        byte[]? param, 
+        long leaseExpiration,
+        long? postponeUntil,
+        long timestamp,
+        StoredId? parent)
+    {
+        _createFunctionSql ??= @$"
+            INSERT INTO {tablePrefix}
+                (type, instance, status, param_json, expires, timestamp, human_instance_id, parent)
+            VALUES
+                ($1, $2, $3, $4, $5, $6, $7, $8)
+            ON CONFLICT DO NOTHING;";
+
+
+        var cmd = new PostgresCommand
+        {
+            Sql = _createFunctionSql,
+            Parameters =
+            [
+                storedId.Type.Value,
+                storedId.Instance.Value,
+                (int)(postponeUntil == null ? Status.Executing : Status.Postponed),
+                param == null ? DBNull.Value : param,
+                postponeUntil ?? leaseExpiration,
+                timestamp,
+                humanInstanceId.Value,
+                parent?.Serialize() ?? (object)DBNull.Value
+            ]
+        };
+        return cmd;
+    }
 }