Added support for table prefix

src/Hangfire.PostgreSql/CountersAggregator.cs

@@ -25,6 +25,7 @@
 using Hangfire.Common;
 using Hangfire.Logging;
 using Hangfire.Server;
+using Utility = Hangfire.PostgreSql.Utils.Utils;
 
 namespace Hangfire.PostgreSql
 {
@@ -81,27 +82,33 @@ public void Execute(CancellationToken cancellationToken)
     private string GetAggregationQuery()
     {
       string schemaName = _storage.Options.SchemaName;
+
       return
         $"""
         BEGIN;
 
-        INSERT INTO "{schemaName}"."aggregatedcounter" ("key", "value", "expireat")	
+        INSERT INTO "{schemaName}"."{TableNameHandler("aggregatedcounter")}" ("key", "value", "expireat")	
         SELECT
           "key",
           SUM("value"),
           MAX("expireat")
-        FROM "{schemaName}"."counter"
+        FROM "{schemaName}"."{TableNameHandler("counter")}"
         GROUP BY "key"
         ON CONFLICT("key") DO UPDATE
-        SET "value" = "aggregatedcounter"."value" + EXCLUDED."value", "expireat" = EXCLUDED."expireat";
+        SET "value" = "{schemaName}"."{TableNameHandler("aggregatedcounter")}"."value" + EXCLUDED."value", "expireat" = EXCLUDED."expireat";
 
-        DELETE FROM "{schemaName}"."counter"
+        DELETE FROM "{schemaName}"."{TableNameHandler("counter")}"
         WHERE "key" IN (
-          SELECT "key" FROM "{schemaName}"."aggregatedcounter"
+          SELECT "key" FROM "{schemaName}"."{TableNameHandler("aggregatedcounter")}"
         );
 
         COMMIT;
         """;
     }
+
+    private string TableNameHandler(string baseName)
+    {
+      return Utility.GetTableName(baseName, _storage.Options.UseTablePrefix, _storage.Options.TablePrefixName);
+    }
   }
 }

src/Hangfire.PostgreSql/ExpirationManager.cs

@@ -27,6 +27,7 @@
 using Hangfire.Logging;
 using Hangfire.Server;
 using Hangfire.Storage;
+using Utility = Hangfire.PostgreSql.Utils.Utils;
 
 namespace Hangfire.PostgreSql
 {
@@ -82,10 +83,10 @@ public void Execute(CancellationToken cancellationToken)
           {
             using IDbTransaction transaction = connection.BeginTransaction();
             removedCount = connection.Execute($@"
-                DELETE FROM ""{_storage.Options.SchemaName}"".""{table}"" 
+                DELETE FROM ""{_storage.Options.SchemaName}"".""{TableNameHandler(table)}"" 
                 WHERE ""id"" IN (
                     SELECT ""id"" 
-                    FROM ""{_storage.Options.SchemaName}"".""{table}"" 
+                    FROM ""{_storage.Options.SchemaName}"".""{TableNameHandler(table)}"" 
                     WHERE ""expireat"" < NOW() 
                     LIMIT {_storage.Options.DeleteExpiredBatchSize.ToString(CultureInfo.InvariantCulture)}
                 )", transaction: transaction);
@@ -129,7 +130,7 @@ private void AggregateCounter(string counterName)
         using IDbTransaction transaction = connection.BeginTransaction(IsolationLevel.ReadCommitted);
         string aggregateQuery = $@"
             WITH ""counters"" AS (
-              DELETE FROM ""{_storage.Options.SchemaName}"".""counter""
+              DELETE FROM ""{_storage.Options.SchemaName}"".""{TableNameHandler("counter")}""
               WHERE ""key"" = @Key
               AND ""expireat"" IS NULL
               RETURNING *
@@ -143,7 +144,7 @@ DELETE FROM ""{_storage.Options.SchemaName}"".""counter""
 
         if (aggregatedValue > 0)
         {
-          string insertQuery = $@"INSERT INTO ""{_storage.Options.SchemaName}"".""counter""(""key"", ""value"") VALUES (@Key, @Value);";
+          string insertQuery = $@"INSERT INTO ""{_storage.Options.SchemaName}"".""{TableNameHandler("counter")}""(""key"", ""value"") VALUES (@Key, @Value);";
           connection.Execute(insertQuery, new { Key = counterName, Value = aggregatedValue });
         }
       });
@@ -176,5 +177,10 @@ private void UseConnectionDistributedLock(PostgreSqlStorage storage, Action<IDbC
           e);
       }
     }
+
+    private string TableNameHandler(string baseName)
+    {
+      return Utility.GetTableName(baseName, _storage.Options.UseTablePrefix, _storage.Options.TablePrefixName);
+    }
   }
 }

src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj

@@ -4,7 +4,7 @@
     <Description>PostgreSql storage implementation for Hangfire (background job system for ASP.NET and aspnet core applications).</Description>
     <Copyright>Copyright © 2014-2024 Frank Hommers and others</Copyright>
     <AssemblyTitle>Hangfire PostgreSql Storage</AssemblyTitle>
-    <VersionPrefix>1.9.4</VersionPrefix>
+    <VersionPrefix>1.9.5-tablePrefix</VersionPrefix>
     <Authors>Frank Hommers, Vytautas Kasparavičius, Žygimantas Arūna</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Hangfire.PostgreSql</AssemblyName>
@@ -14,9 +14,9 @@
     <PackageReleaseNotes>https://github.com/frankhommers/Hangfire.PostgreSql/releases</PackageReleaseNotes>
     <PackageProjectUrl>http://hmm.rs/Hangfire.PostgreSql</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
-    <Version>1.9.4.0</Version>
-    <FileVersion>1.9.4.0</FileVersion>
-    <AssemblyVersion>1.9.4.0</AssemblyVersion>
+    <Version>1.9.5-tablePrefix</Version>
+    <FileVersion>1.9.5-tablePrefix</FileVersion>
+    <AssemblyVersion>1.9.5-tablePrefix</AssemblyVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/frankhommers/Hangfire.PostgreSql</RepositoryUrl>