@workglow/postgres 0.2.30 → 0.2.32

package/dist/job-queue/browser.js

@@ -1,9 +1,255 @@
 // src/job-queue/PostgresQueueStorage.ts
 import { createHash } from "node:crypto";
 import { createServiceToken, getLogger, makeFingerprint, uuid4 } from "@workglow/util";
+import { JobStatus as JobStatus2 } from "@workglow/job-queue";
+import {
+  assertPrefixesSafe,
+  buildPrefixInsertFragments,
+  buildPrefixWhereClause,
+  getPrefixColumnNames,
+  getPrefixParamValues,
+  PostgresDialect as PostgresDialect2
+} from "@workglow/storage";
+
+// src/migrations/PostgresMigrationRunner.ts
+import {
+  MIGRATIONS_TABLE,
+  sortMigrations
+} from "@workglow/storage";
+
+class PostgresMigrationRunner {
+  db;
+  constructor(db) {
+    this.db = db;
+  }
+  async ensureBookkeepingTable() {
+    await this.db.query(`
+      CREATE TABLE IF NOT EXISTS ${MIGRATIONS_TABLE} (
+        component TEXT NOT NULL,
+        version INTEGER NOT NULL,
+        description TEXT,
+        applied_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+        PRIMARY KEY (component, version)
+      )
+    `);
+  }
+  async appliedVersions(component) {
+    const result = await this.db.query(`SELECT version FROM ${MIGRATIONS_TABLE} WHERE component = $1`, [component]);
+    return new Set(result.rows.map((r) => Number(r.version)));
+  }
+  async acquireClient() {
+    const pool = this.db;
+    if (typeof pool.connect === "function") {
+      const client = await pool.connect();
+      return { client, release: () => client.release() };
+    }
+    return { client: this.db, release: () => {
+      return;
+    } };
+  }
+  async run(migrations, options = {}) {
+    await this.ensureBookkeepingTable();
+    const sorted = sortMigrations(migrations);
+    const applied = [];
+    const cache = new Map;
+    const onProgress = options.onProgress;
+    for (const m of sorted) {
+      let seen = cache.get(m.component);
+      if (!seen) {
+        seen = await this.appliedVersions(m.component);
+        cache.set(m.component, seen);
+      }
+      if (seen.has(m.version))
+        continue;
+      onProgress?.({
+        component: m.component,
+        version: m.version,
+        phase: "starting",
+        description: m.description
+      });
+      const { client, release } = await this.acquireClient();
+      try {
+        await client.query("BEGIN");
+        await m.up(client, (fraction) => {
+          onProgress?.({
+            component: m.component,
+            version: m.version,
+            phase: "running",
+            description: m.description,
+            fraction
+          });
+        });
+        await client.query(`INSERT INTO ${MIGRATIONS_TABLE}(component, version, description) VALUES ($1, $2, $3)`, [m.component, m.version, m.description ?? null]);
+        await client.query("COMMIT");
+        seen.add(m.version);
+        applied.push(m);
+        onProgress?.({
+          component: m.component,
+          version: m.version,
+          phase: "completed",
+          description: m.description,
+          fraction: 1
+        });
+      } catch (err) {
+        await client.query("ROLLBACK").catch(() => {
+          return;
+        });
+        if (err?.code === "23505") {
+          seen.add(m.version);
+          onProgress?.({
+            component: m.component,
+            version: m.version,
+            phase: "completed",
+            description: m.description,
+            fraction: 1
+          });
+          continue;
+        }
+        onProgress?.({
+          component: m.component,
+          version: m.version,
+          phase: "failed",
+          description: m.description,
+          error: err
+        });
+        throw err;
+      } finally {
+        release();
+      }
+    }
+    return applied;
+  }
+}
+
+// src/migrations/postgresQueueMigrations.ts
 import { JobStatus } from "@workglow/job-queue";
+import {
+  buildPrefixColumnsSql,
+  getPrefixIndexPrefix,
+  getPrefixIndexSuffix,
+  PostgresDialect
+} from "@workglow/storage";
+var JOB_STATUS_V1 = [
+  "PENDING",
+  "PROCESSING",
+  "COMPLETED",
+  "ABORTING",
+  "FAILED",
+  "DISABLED"
+];
+function assertJobStatusMatchesV1() {
+  const current = new Set(Object.values(JobStatus));
+  for (const v of JOB_STATUS_V1) {
+    if (!current.has(v)) {
+      throw new Error(`JobStatus const is missing v1 enum value "${v}"; v1 migration values are frozen.`);
+    }
+  }
+  for (const v of current) {
+    if (!JOB_STATUS_V1.includes(v)) {
+      throw new Error(`JobStatus contains "${v}" which is not in JOB_STATUS_V1. ` + `Add a new migration that runs "ALTER TYPE job_status ADD VALUE IF NOT EXISTS '${v}'" ` + `instead of mutating the v1 enum literal.`);
+    }
+  }
+}
+function postgresQueueMigrations(tableName, prefixes) {
+  assertJobStatusMatchesV1();
+  const component = `queue:postgres:${tableName}`;
+  const prefixColumnsSql = buildPrefixColumnsSql(PostgresDialect, prefixes);
+  const prefixIndexPrefix = getPrefixIndexPrefix(prefixes);
+  const indexSuffix = getPrefixIndexSuffix(prefixes);
+  return [
+    {
+      component,
+      version: 1,
+      description: "Create job_status enum + queue table + indexes + notify trigger",
+      async up(db) {
+        const enumLiteral = JOB_STATUS_V1.map((v) => `'${v}'`).join(",");
+        await db.query(`
+          DO $$
+          BEGIN
+            IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'job_status') THEN
+              CREATE TYPE job_status AS ENUM (${enumLiteral});
+            END IF;
+          END $$;
+        `);
+        await db.query(`
+          CREATE TABLE IF NOT EXISTS ${tableName} (
+            id SERIAL NOT NULL,
+            ${prefixColumnsSql}fingerprint text NOT NULL,
+            queue text NOT NULL,
+            job_run_id text NOT NULL,
+            status job_status NOT NULL default 'PENDING',
+            input jsonb NOT NULL,
+            output jsonb,
+            run_attempts integer default 0,
+            max_retries integer default 20,
+            run_after timestamp with time zone DEFAULT now(),
+            last_ran_at timestamp with time zone,
+            created_at timestamp with time zone DEFAULT now(),
+            deadline_at timestamp with time zone,
+            completed_at timestamp with time zone,
+            error text,
+            error_code text,
+            progress real DEFAULT 0,
+            progress_message text DEFAULT '',
+            progress_details jsonb,
+            worker_id text
+          )
+        `);
+        await db.query(`
+          CREATE INDEX IF NOT EXISTS job_fetcher${indexSuffix}_idx
+            ON ${tableName} (${prefixIndexPrefix}id, status, run_after)
+        `);
+        await db.query(`
+          CREATE INDEX IF NOT EXISTS job_queue_fetcher${indexSuffix}_idx
+            ON ${tableName} (${prefixIndexPrefix}queue, status, run_after)
+        `);
+        await db.query(`
+          CREATE INDEX IF NOT EXISTS jobs_fingerprint${indexSuffix}_unique_idx
+            ON ${tableName} (${prefixIndexPrefix}queue, fingerprint, status)
+        `);
+        const fnName = `${tableName}_notify`;
+        const trgName = `${tableName}_notify_trg`;
+        await db.query("SAVEPOINT install_notify_trigger");
+        try {
+          await db.query(`
+            CREATE OR REPLACE FUNCTION ${fnName}() RETURNS trigger AS $fn$
+            DECLARE
+              channel TEXT := 'wglw_q_' || md5('${tableName}' || COALESCE(NEW.queue, OLD.queue));
+              payload TEXT;
+            BEGIN
+              payload := json_build_object(
+                'op', TG_OP,
+                'id', COALESCE(NEW.id, OLD.id),
+                'queue', COALESCE(NEW.queue, OLD.queue),
+                'status', COALESCE(NEW.status::text, OLD.status::text)
+              )::text;
+              PERFORM pg_notify(channel, payload);
+              RETURN NULL;
+            END;
+            $fn$ LANGUAGE plpgsql;
+          `);
+          await db.query(`DROP TRIGGER IF EXISTS ${trgName} ON ${tableName}`);
+          await db.query(`
+            CREATE TRIGGER ${trgName}
+              AFTER INSERT OR UPDATE ON ${tableName}
+              FOR EACH ROW EXECUTE FUNCTION ${fnName}();
+          `);
+          await db.query("RELEASE SAVEPOINT install_notify_trigger");
+        } catch {
+          await db.query("ROLLBACK TO SAVEPOINT install_notify_trigger").catch(() => {
+            return;
+          });
+          await db.query("RELEASE SAVEPOINT install_notify_trigger").catch(() => {
+            return;
+          });
+        }
+      }
+    }
+  ];
+}
+
+// src/job-queue/PostgresQueueStorage.ts
 var POSTGRES_QUEUE_STORAGE = createServiceToken("jobqueue.storage.postgres");
-var SAFE_IDENTIFIER = /^[a-zA-Z][a-zA-Z0-9_]*$/;
 
 class PostgresQueueStorage {
   db;
@@ -17,11 +263,7 @@ class PostgresQueueStorage {
     this.queueName = queueName;
     this.prefixes = options?.prefixes ?? [];
     this.prefixValues = options?.prefixValues ?? {};
-    for (const prefix of this.prefixes) {
-      if (!SAFE_IDENTIFIER.test(prefix.name)) {
-        throw new Error(`Prefix column name must start with a letter and contain only letters, digits, and underscores, got: ${prefix.name}`);
-      }
-    }
+    assertPrefixesSafe(this.prefixes);
     if (this.prefixes.length > 0) {
       const prefixNames = this.prefixes.map((p) => p.name).join("_");
       this.tableName = `job_queue_${prefixNames}`;
@@ -29,112 +271,17 @@ class PostgresQueueStorage {
       this.tableName = "job_queue";
     }
   }
-  getPrefixColumnType(type) {
-    return type === "uuid" ? "UUID" : "INTEGER";
-  }
-  buildPrefixColumnsSql() {
-    if (this.prefixes.length === 0)
-      return "";
-    return this.prefixes.map((p) => `${p.name} ${this.getPrefixColumnType(p.type)} NOT NULL`).join(`,
-      `) + `,
-      `;
-  }
-  getPrefixColumnNames() {
-    return this.prefixes.map((p) => p.name);
-  }
   buildPrefixWhereClause(startParam) {
-    if (this.prefixes.length === 0) {
-      return { conditions: "", params: [] };
-    }
-    const conditions = this.prefixes.map((p, i) => `${p.name} = $${startParam + i}`).join(" AND ");
-    const params = this.prefixes.map((p) => this.prefixValues[p.name]);
-    return { conditions: " AND " + conditions, params };
+    return buildPrefixWhereClause(PostgresDialect2, this.prefixes, this.prefixValues, startParam);
   }
   getPrefixParamValues() {
-    return this.prefixes.map((p) => this.prefixValues[p.name]);
+    return getPrefixParamValues(this.prefixes, this.prefixValues);
   }
-  async setupDatabase() {
-    let sql;
-    try {
-      const enumValues = Object.values(JobStatus);
-      for (const v of enumValues) {
-        if (!SAFE_IDENTIFIER.test(v)) {
-          throw new Error(`Invalid JobStatus enum value: ${v}`);
-        }
-      }
-      sql = `CREATE TYPE job_status AS ENUM (${enumValues.map((v) => `'${v}'`).join(",")})`;
-      await this.db.query(sql);
-    } catch (e) {
-      if (e.code !== "42710")
-        throw e;
-    }
-    const prefixColumnsSql = this.buildPrefixColumnsSql();
-    const prefixColumnNames = this.getPrefixColumnNames();
-    const prefixIndexPrefix = prefixColumnNames.length > 0 ? prefixColumnNames.join(", ") + ", " : "";
-    sql = `
-    CREATE TABLE IF NOT EXISTS ${this.tableName} (
-      id SERIAL NOT NULL,
-      ${prefixColumnsSql}fingerprint text NOT NULL,
-      queue text NOT NULL,
-      job_run_id text NOT NULL,
-      status job_status NOT NULL default 'PENDING',
-      input jsonb NOT NULL,
-      output jsonb,
-      run_attempts integer default 0,
-      max_retries integer default 20,
-      run_after timestamp with time zone DEFAULT now(),
-      last_ran_at timestamp with time zone,
-      created_at timestamp with time zone DEFAULT now(),
-      deadline_at timestamp with time zone,
-      completed_at timestamp with time zone,
-      error text,
-      error_code text,
-      progress real DEFAULT 0,
-      progress_message text DEFAULT '',
-      progress_details jsonb,
-      worker_id text
-    )`;
-    await this.db.query(sql);
-    const indexSuffix = prefixColumnNames.length > 0 ? "_" + prefixColumnNames.join("_") : "";
-    sql = `
-      CREATE INDEX IF NOT EXISTS job_fetcher${indexSuffix}_idx 
-        ON ${this.tableName} (${prefixIndexPrefix}id, status, run_after)`;
-    await this.db.query(sql);
-    sql = `
-      CREATE INDEX IF NOT EXISTS job_queue_fetcher${indexSuffix}_idx 
-        ON ${this.tableName} (${prefixIndexPrefix}queue, status, run_after)`;
-    await this.db.query(sql);
-    sql = `
-      CREATE INDEX IF NOT EXISTS jobs_fingerprint${indexSuffix}_unique_idx
-        ON ${this.tableName} (${prefixIndexPrefix}queue, fingerprint, status)`;
-    await this.db.query(sql);
-    const fnName = `${this.tableName}_notify`;
-    const trgName = `${this.tableName}_notify_trg`;
-    try {
-      await this.db.query(`
-        CREATE OR REPLACE FUNCTION ${fnName}() RETURNS trigger AS $fn$
-        DECLARE
-          channel TEXT := 'wglw_q_' || md5('${this.tableName}' || COALESCE(NEW.queue, OLD.queue));
-          payload TEXT;
-        BEGIN
-          payload := json_build_object(
-            'op', TG_OP,
-            'id', COALESCE(NEW.id, OLD.id),
-            'queue', COALESCE(NEW.queue, OLD.queue),
-            'status', COALESCE(NEW.status::text, OLD.status::text)
-          )::text;
-          PERFORM pg_notify(channel, payload);
-          RETURN NULL;
-        END;
-        $fn$ LANGUAGE plpgsql;
-      `);
-      await this.db.query(`DROP TRIGGER IF EXISTS ${trgName} ON ${this.tableName}`);
-      await this.db.query(`
-        CREATE TRIGGER ${trgName}
-          AFTER INSERT OR UPDATE ON ${this.tableName}
-          FOR EACH ROW EXECUTE FUNCTION ${fnName}();
-      `);
-    } catch {}
+  getMigrations() {
+    return postgresQueueMigrations(this.tableName, this.prefixes);
+  }
+  async migrate() {
+    await new PostgresMigrationRunner(this.db).run(this.getMigrations());
   }
   notifyChannelName() {
     const tableAndQueue = `${this.tableName}${this.queueName}`;
@@ -146,16 +293,15 @@ class PostgresQueueStorage {
     job.queue = this.queueName;
     job.job_run_id = job.job_run_id ?? uuid4();
     job.fingerprint = await makeFingerprint(job.input);
-    job.status = JobStatus.PENDING;
+    job.status = JobStatus2.PENDING;
     job.progress = 0;
     job.progress_message = "";
     job.progress_details = null;
     job.created_at = now;
     job.run_after = now;
-    const prefixColumnNames = this.getPrefixColumnNames();
-    const prefixColumnsInsert = prefixColumnNames.length > 0 ? prefixColumnNames.join(", ") + ", " : "";
+    const prefixColumnNames = getPrefixColumnNames(this.prefixes);
+    const { columns: prefixColumnsInsert, placeholders: prefixParamPlaceholders } = buildPrefixInsertFragments(PostgresDialect2, this.prefixes, 1);
     const prefixParamValues = this.getPrefixParamValues();
-    const prefixParamPlaceholders = prefixColumnNames.length > 0 ? prefixColumnNames.map((_, i) => `$${i + 1}`).join(",") + "," : "";
     const baseParamStart = prefixColumnNames.length + 1;
     const sql = `
       INSERT INTO ${this.tableName}(
@@ -205,7 +351,7 @@ class PostgresQueueStorage {
       return;
     return result.rows[0];
   }
-  async peek(status = JobStatus.PENDING, num = 100) {
+  async peek(status = JobStatus2.PENDING, num = 100) {
     num = Number(num) || 100;
     const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(4);
     const result = await this.db.query(`
@@ -236,10 +382,10 @@ class PostgresQueueStorage {
         FOR UPDATE SKIP LOCKED 
         LIMIT 1
       )
-      RETURNING *`, [JobStatus.PROCESSING, this.queueName, JobStatus.PENDING, workerId, ...prefixParams]);
+      RETURNING *`, [JobStatus2.PROCESSING, this.queueName, JobStatus2.PENDING, workerId, ...prefixParams]);
     return result?.rows?.[0] ?? undefined;
   }
-  async size(status = JobStatus.PENDING) {
+  async size(status = JobStatus2.PENDING) {
     const { conditions: prefixConditions, params: prefixParams } = this.buildPrefixWhereClause(3);
     const result = await this.db.query(`
       SELECT COUNT(*) as count
@@ -252,7 +398,7 @@ class PostgresQueueStorage {
   }
   async complete(jobDetails) {
     const prefixParams = this.getPrefixParamValues();
-    if (jobDetails.status === JobStatus.DISABLED) {
+    if (jobDetails.status === JobStatus2.DISABLED) {
       const { conditions: prefixConditions } = this.buildPrefixWhereClause(4);
       await this.db.query(`UPDATE ${this.tableName} 
           SET 
@@ -262,7 +408,7 @@ class PostgresQueueStorage {
             progress_details = NULL,
             completed_at = NOW() AT TIME ZONE 'UTC'
           WHERE id = $2 AND queue = $3${prefixConditions}`, [jobDetails.status, jobDetails.id, this.queueName, ...prefixParams]);
-    } else if (jobDetails.status === JobStatus.PENDING) {
+    } else if (jobDetails.status === JobStatus2.PENDING) {
       const { conditions: prefixConditions } = this.buildPrefixWhereClause(7);
       await this.db.query(`UPDATE ${this.tableName} 
           SET 
@@ -508,6 +654,59 @@ class PostgresQueueStorage {
 }
 // src/job-queue/PostgresRateLimiterStorage.ts
 import { createServiceToken as createServiceToken2 } from "@workglow/util";
+import {
+  assertPrefixesSafe as assertPrefixesSafe2,
+  buildPrefixWhereClause as buildPrefixWhereClause2,
+  getPrefixColumnNames as getPrefixColumnNames3,
+  getPrefixParamValues as getPrefixParamValues2,
+  PostgresDialect as PostgresDialect4
+} from "@workglow/storage";
+
+// src/migrations/postgresRateLimiterMigrations.ts
+import {
+  buildPrefixColumnsSql as buildPrefixColumnsSql2,
+  getPrefixColumnNames as getPrefixColumnNames2,
+  getPrefixIndexPrefix as getPrefixIndexPrefix2,
+  getPrefixIndexSuffix as getPrefixIndexSuffix2,
+  PostgresDialect as PostgresDialect3
+} from "@workglow/storage";
+function postgresRateLimiterMigrations(executionTableName, nextAvailableTableName, prefixes) {
+  const component = `rate-limiter:postgres:${executionTableName}`;
+  const prefixColumnsSql = buildPrefixColumnsSql2(PostgresDialect3, prefixes);
+  const prefixColumnNames = getPrefixColumnNames2(prefixes);
+  const prefixIndexPrefix = getPrefixIndexPrefix2(prefixes);
+  const indexSuffix = getPrefixIndexSuffix2(prefixes);
+  const primaryKeyColumns = prefixColumnNames.length > 0 ? `${prefixColumnNames.join(", ")}, queue_name` : "queue_name";
+  return [
+    {
+      component,
+      version: 1,
+      description: "Create rate-limiter execution + next_available tables",
+      async up(db) {
+        await db.query(`
+          CREATE TABLE IF NOT EXISTS ${executionTableName} (
+            id SERIAL PRIMARY KEY,
+            ${prefixColumnsSql}queue_name TEXT NOT NULL,
+            executed_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+          )
+        `);
+        await db.query(`
+          CREATE INDEX IF NOT EXISTS rate_limit_exec_queue${indexSuffix}_idx
+            ON ${executionTableName} (${prefixIndexPrefix}queue_name, executed_at)
+        `);
+        await db.query(`
+          CREATE TABLE IF NOT EXISTS ${nextAvailableTableName} (
+            ${prefixColumnsSql}queue_name TEXT NOT NULL,
+            next_available_at TIMESTAMP WITH TIME ZONE,
+            PRIMARY KEY (${primaryKeyColumns})
+          )
+        `);
+      }
+    }
+  ];
+}
+
+// src/job-queue/PostgresRateLimiterStorage.ts
 var POSTGRES_RATE_LIMITER_STORAGE = createServiceToken2("ratelimiter.storage.postgres");
 
 class PostgresRateLimiterStorage {
@@ -521,6 +720,7 @@ class PostgresRateLimiterStorage {
     this.db = db;
     this.prefixes = options?.prefixes ?? [];
     this.prefixValues = options?.prefixValues ?? {};
+    assertPrefixesSafe2(this.prefixes);
     if (this.prefixes.length > 0) {
       const prefixNames = this.prefixes.map((p) => p.name).join("_");
       this.executionTableName = `rate_limit_executions_${prefixNames}`;
@@ -530,57 +730,20 @@ class PostgresRateLimiterStorage {
       this.nextAvailableTableName = "rate_limit_next_available";
     }
   }
-  getPrefixColumnType(type) {
-    return type === "uuid" ? "UUID" : "INTEGER";
-  }
-  buildPrefixColumnsSql() {
-    if (this.prefixes.length === 0)
-      return "";
-    return this.prefixes.map((p) => `${p.name} ${this.getPrefixColumnType(p.type)} NOT NULL`).join(`,
-        `) + `,
-        `;
-  }
-  getPrefixColumnNames() {
-    return this.prefixes.map((p) => p.name);
-  }
   buildPrefixWhereClause(startParam) {
-    if (this.prefixes.length === 0) {
-      return { conditions: "", params: [] };
-    }
-    const conditions = this.prefixes.map((p, i) => `${p.name} = $${startParam + i}`).join(" AND ");
-    const params = this.prefixes.map((p) => this.prefixValues[p.name]);
-    return { conditions: " AND " + conditions, params };
+    return buildPrefixWhereClause2(PostgresDialect4, this.prefixes, this.prefixValues, startParam);
   }
   getPrefixParamValues() {
-    return this.prefixes.map((p) => this.prefixValues[p.name]);
+    return getPrefixParamValues2(this.prefixes, this.prefixValues);
   }
-  async setupDatabase() {
-    const prefixColumnsSql = this.buildPrefixColumnsSql();
-    const prefixColumnNames = this.getPrefixColumnNames();
-    const prefixIndexPrefix = prefixColumnNames.length > 0 ? prefixColumnNames.join(", ") + ", " : "";
-    const indexSuffix = prefixColumnNames.length > 0 ? "_" + prefixColumnNames.join("_") : "";
-    await this.db.query(`
-      CREATE TABLE IF NOT EXISTS ${this.executionTableName} (
-        id SERIAL PRIMARY KEY,
-        ${prefixColumnsSql}queue_name TEXT NOT NULL,
-        executed_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
-      )
-    `);
-    await this.db.query(`
-      CREATE INDEX IF NOT EXISTS rate_limit_exec_queue${indexSuffix}_idx 
-        ON ${this.executionTableName} (${prefixIndexPrefix}queue_name, executed_at)
-    `);
-    const primaryKeyColumns = prefixColumnNames.length > 0 ? `${prefixColumnNames.join(", ")}, queue_name` : "queue_name";
-    await this.db.query(`
-      CREATE TABLE IF NOT EXISTS ${this.nextAvailableTableName} (
-        ${prefixColumnsSql}queue_name TEXT NOT NULL,
-        next_available_at TIMESTAMP WITH TIME ZONE,
-        PRIMARY KEY (${primaryKeyColumns})
-      )
-    `);
+  getMigrations() {
+    return postgresRateLimiterMigrations(this.executionTableName, this.nextAvailableTableName, this.prefixes);
+  }
+  async migrate() {
+    await new PostgresMigrationRunner(this.db).run(this.getMigrations());
   }
   async tryReserveExecution(queueName, maxExecutions, windowMs) {
-    const prefixColumnNames = this.getPrefixColumnNames();
+    const prefixColumnNames = getPrefixColumnNames3(this.prefixes);
     const prefixParamValues = this.getPrefixParamValues();
     const prefixCount = prefixColumnNames.length;
     const queueParam = `$${prefixCount + 1}`;
@@ -657,7 +820,7 @@ class PostgresRateLimiterStorage {
     await this.db.query(`DELETE FROM ${this.executionTableName} WHERE id = $1 AND queue_name = $2${prefixConditions}`, [token, queueName, ...prefixParams]);
   }
   async recordExecution(queueName) {
-    const prefixColumnNames = this.getPrefixColumnNames();
+    const prefixColumnNames = getPrefixColumnNames3(this.prefixes);
     const prefixColumnsInsert = prefixColumnNames.length > 0 ? prefixColumnNames.join(", ") + ", " : "";
     const prefixParamValues = this.getPrefixParamValues();
     const prefixParamPlaceholders = prefixColumnNames.length > 0 ? prefixColumnNames.map((_, i) => `$${i + 1}`).join(", ") + ", " : "";
@@ -703,7 +866,7 @@ class PostgresRateLimiterStorage {
     return new Date(nextAvailableAt).toISOString();
   }
   async setNextAvailableTime(queueName, nextAvailableAt) {
-    const prefixColumnNames = this.getPrefixColumnNames();
+    const prefixColumnNames = getPrefixColumnNames3(this.prefixes);
     const prefixColumnsInsert = prefixColumnNames.length > 0 ? prefixColumnNames.join(", ") + ", " : "";
     const prefixParamValues = this.getPrefixParamValues();
     const prefixParamPlaceholders = prefixColumnNames.length > 0 ? prefixColumnNames.map((_, i) => `$${i + 1}`).join(", ") + ", " : "";
@@ -723,10 +886,13 @@ class PostgresRateLimiterStorage {
   }
 }
 export {
+  postgresRateLimiterMigrations,
+  postgresQueueMigrations,
   PostgresRateLimiterStorage,
   PostgresQueueStorage,
+  PostgresMigrationRunner,
   POSTGRES_RATE_LIMITER_STORAGE,
   POSTGRES_QUEUE_STORAGE
 };
 
-//# debugId=284C7CF8F18C4E0564756E2164756E21
+//# debugId=9559FE4247FC32D964756E2164756E21