effect-mq 0.3.2 → 0.4.1

package/src/drizzle-postgres/DrizzleJobStore.ts

@@ -113,6 +113,7 @@ type JobRow = {
   readonly timeoutMs: number | string | null
   readonly cancelRequested: boolean
   readonly dedupeKey: string | null
+  readonly trace: JobStore.TraceContext | null
   readonly runAt: Date
   readonly enqueuedAt: Date
   readonly processedAt: Date | null
@@ -171,6 +172,7 @@ const toRecord = (row: JobRow): JobStore.JobRecord => ({
   timeoutMs: row.timeoutMs === null || row.timeoutMs === undefined ? undefined : Number(row.timeoutMs),
   cancelRequested: row.cancelRequested,
   dedupeKey: row.dedupeKey ?? undefined,
+  trace: row.trace ?? undefined,
   runAt: row.runAt.getTime(),
   enqueuedAt: row.enqueuedAt.getTime(),
   processedAt: row.processedAt?.getTime(),
@@ -220,6 +222,7 @@ export const make = (
       "timeoutMs",
       "cancelRequested",
       "dedupeKey",
+      "trace",
       "runAt",
       "enqueuedAt",
       "processedAt",
@@ -490,13 +493,15 @@ export const make = (
             : sql`'j-' || ${seqExpr}::text`
           const rows = rowsOf(yield* exec.execute<{ id: string }>(sql`
             INSERT INTO ${jobs} (id, name, queue, state, priority, payload, metadata,
-              attempts_max, backoff, keep, timeout_ms, dedupe_key, run_at, enqueued_at${extraColumnNames})
+              attempts_max, backoff, keep, timeout_ms, dedupe_key, trace, run_at, enqueued_at${extraColumnNames})
             VALUES (${idExpr}, ${request.name}, ${request.queue}, ${state}, ${request.priority},
               ${JSON.stringify(request.payload ?? null)}::jsonb, ${JSON.stringify(request.metadata)}::jsonb,
               ${request.attemptsMax},
               ${request.backoff === undefined ? null : JSON.stringify(request.backoff)}::jsonb,
               ${request.keep === undefined ? null : JSON.stringify(request.keep)}::jsonb,
-              ${request.timeoutMs ?? null}, ${request.dedupe?.key ?? null}, ${runAt}, ${now}${extraColumnValues(request)})
+              ${request.timeoutMs ?? null}, ${request.dedupe?.key ?? null},
+              ${request.trace === undefined ? null : JSON.stringify(request.trace)}::jsonb,
+              ${runAt}, ${now}${extraColumnValues(request)})
             ON CONFLICT (id) DO NOTHING
             RETURNING ${jobs.id} AS id
           `).pipe(Effect.mapError(storeError("enqueue failed"))))
@@ -572,6 +577,7 @@ export const make = (
                   backoff = ${request.backoff === undefined ? null : JSON.stringify(request.backoff)}::jsonb,
                   keep = ${request.keep === undefined ? null : JSON.stringify(request.keep)}::jsonb,
                   timeout_ms = ${request.timeoutMs ?? null},
+                  trace = ${request.trace === undefined ? null : JSON.stringify(request.trace)}::jsonb,
                   run_at = ${new Date(now.getTime() + Math.max(0, request.delayMs))}${extraColumnAssignments(request)}
                 WHERE ${jobs.id} = ${entry.jobId} AND ${jobs.state} = 'delayed'
                 RETURNING ${jobs.id} AS id, ${jobs.queue} AS "queue"
@@ -650,22 +656,224 @@ export const make = (
             AND (${dedupe.windowExpiresAt} IS NULL OR ${dedupe.windowExpiresAt} <= ${now})
         `).pipe(Effect.asVoid)
 
+    // Shared by cancel and cancelByDedupe.
+    const cancelJob = (id: JobStore.JobId) =>
+      db.transaction((tx) =>
+          Effect.gen(function*() {
+            const now = yield* nowDate
+            // One guarded statement: waiting/delayed become terminal, active
+            // gets the cancel-request flag; anything else is reported by state.
+            const rows = rowsOf(yield* tx.execute<
+              {
+                id: string
+                state: string
+                processedAt: Date | null
+                name: string
+                keep: JobStore.KeepPolicy | null
+                dedupeKey: string | null
+              }
+            >(sql`
+              UPDATE ${jobs} SET
+                state = CASE WHEN ${jobs.state} IN ('waiting', 'delayed') THEN 'cancelled' ELSE ${jobs.state} END,
+                finished_at = CASE WHEN ${jobs.state} IN ('waiting', 'delayed') THEN ${now}::timestamptz ELSE ${jobs.finishedAt} END,
+                cancel_requested = CASE WHEN ${jobs.state} = 'active' THEN TRUE ELSE ${jobs.cancelRequested} END
+              WHERE ${jobs.id} = ${id} AND ${jobs.state} IN ('waiting', 'delayed', 'active')
+              RETURNING ${jobs.id} AS id, ${jobs.state} AS state,
+                ${jobs.processedAt} AS "processedAt", ${jobs.name} AS "name", ${jobs.keep} AS "keep",
+                ${jobs.dedupeKey} AS "dedupeKey"
+            `))
+            const row = rows[0]
+            if (row === undefined) {
+              const existing = rowsOf(yield* tx.execute<{ state: JobStore.JobState }>(sql`
+                SELECT ${jobs.state} AS state FROM ${jobs} WHERE ${jobs.id} = ${id}
+              `))
+              const found = existing[0]
+              if (found === undefined) {
+                return yield* new JobStore.JobNotFoundError({ jobId: id })
+              }
+              return yield* new JobStore.JobNotCancellableError({ jobId: id, state: found.state })
+            }
+            if (row.state === "cancelled") {
+              yield* insertAttempt(tx, id, "cancelled", row.processedAt, now, undefined)
+              yield* releaseDedupe(tx, row.name, row.dedupeKey, id, now)
+              yield* applyKeep(tx, { name: row.name, state: "cancelled", keep: row.keep }, now)
+            }
+          })
+        ).pipe(
+          Effect.mapError((error) =>
+            error instanceof JobStore.JobNotFoundError ||
+              error instanceof JobStore.JobNotCancellableError ||
+              error instanceof JobStore.JobStoreError
+              ? error
+              : storeError("cancel failed")(error)
+          ),
+          Effect.asVoid
+        )
+
+    const enqueueOne = (request: JobStore.EnqueueRequest) =>
+      Effect.gen(function*() {
+        if (request.dedupe !== undefined) {
+          const result = yield* enqueueDeduped(request, request.dedupe)
+          if (result.wake) {
+            yield* wakeUp("wakeQueue" in result && result.wakeQueue !== undefined ? result.wakeQueue : request.queue)
+          }
+          return { id: result.id, duplicate: result.duplicate }
+        }
+        const now = yield* nowDate
+        const result = yield* insertJob(db, request, now)
+        if (!result.duplicate) {
+          yield* wakeUp(request.queue)
+        }
+        return result
+      })
+
+    // Multi-row insert with every id resolved client-side, so the ON
+    // CONFLICT outcome maps back to items unambiguously (RETURNING only
+    // yields rows that actually inserted, in no guaranteed order). Auto ids
+    // draw from the seq sequence one statement per round; a conflicted auto
+    // id (user squatting on "j-<n>", or a colliding generator) re-draws.
+    const insertBatch = (requests: ReadonlyArray<JobStore.EnqueueRequest>) =>
+      Effect.gen(function*() {
+        const now = yield* nowDate
+        const generate = options.idGenerator
+        const results: Array<JobStore.EnqueueResult | undefined> = requests.map(() => undefined)
+        interface PendingItem {
+          readonly request: JobStore.EnqueueRequest
+          readonly index: number
+          id: JobStore.JobId | undefined
+        }
+        let pending: Array<PendingItem> = requests.map((request, index) => ({ request, index, id: request.id }))
+        for (let round = 0; round < 5 && pending.length > 0; round++) {
+          const needIds = pending.filter((item) => item.id === undefined)
+          if (needIds.length > 0) {
+            if (generate !== undefined) {
+              for (const item of needIds) {
+                const raw = generate(item.request)
+                item.id = JobId(Effect.isEffect(raw) ? yield* raw : raw)
+              }
+            } else {
+              const rows = rowsOf(yield* db.execute<{ id: string }>(sql`
+                SELECT 'j-' || ${seqExpr}::text AS id FROM generate_series(1, ${needIds.length})
+              `).pipe(Effect.mapError(storeError("enqueueMany failed"))))
+              for (let i = 0; i < needIds.length; i++) {
+                const row = rows[i]
+                const item = needIds[i]
+                if (row !== undefined && item !== undefined) {
+                  item.id = JobId(row.id)
+                }
+              }
+            }
+          }
+          // Intra-batch repeats: only an id's first occurrence inserts. A
+          // later explicit repeat is a duplicate; an auto collision re-draws.
+          const seen = new Set<string>()
+          const toInsert: Array<{ request: JobStore.EnqueueRequest; index: number; id: JobStore.JobId }> = []
+          const stillPending: Array<PendingItem> = []
+          for (const item of pending) {
+            const id = item.id
+            if (id === undefined) continue
+            if (seen.has(id)) {
+              if (item.request.id !== undefined) {
+                results[item.index] = { id, duplicate: true }
+              } else {
+                item.id = undefined
+                stillPending.push(item)
+              }
+              continue
+            }
+            seen.add(id)
+            toInsert.push({ request: item.request, index: item.index, id })
+          }
+          pending = stillPending
+          // One INSERT per chunk keeps the bind-parameter count bounded.
+          for (let start = 0; start < toInsert.length; start += 500) {
+            const chunk = toInsert.slice(start, start + 500)
+            const values = chunk.map(({ id, request }) =>
+              sql`(${id}, ${request.name}, ${request.queue}, ${
+                request.delayMs > 0 ? "delayed" : "waiting"
+              }, ${request.priority},
+                ${JSON.stringify(request.payload ?? null)}::jsonb, ${JSON.stringify(request.metadata)}::jsonb,
+                ${request.attemptsMax},
+                ${request.backoff === undefined ? null : JSON.stringify(request.backoff)}::jsonb,
+                ${request.keep === undefined ? null : JSON.stringify(request.keep)}::jsonb,
+                ${request.timeoutMs ?? null}, ${request.dedupe?.key ?? null},
+                ${request.trace === undefined ? null : JSON.stringify(request.trace)}::jsonb,
+                ${new Date(now.getTime() + Math.max(0, request.delayMs))}, ${now}${extraColumnValues(request)})`
+            )
+            const rows = rowsOf(yield* db.execute<{ id: string }>(sql`
+              INSERT INTO ${jobs} (id, name, queue, state, priority, payload, metadata,
+                attempts_max, backoff, keep, timeout_ms, dedupe_key, trace, run_at, enqueued_at${extraColumnNames})
+              VALUES ${sql.join(values, sql`, `)}
+              ON CONFLICT (id) DO NOTHING
+              RETURNING ${jobs.id} AS id
+            `).pipe(Effect.mapError(storeError("enqueueMany failed"))))
+            const inserted = new Set(rows.map((row) => row.id))
+            // Wake per committed chunk, immediately: a later chunk's failure
+            // (or id exhaustion below) must not strand these durable rows
+            // unwoken until the poll interval.
+            const freshQueues = new Set<JobStore.QueueName>()
+            for (const item of chunk) {
+              if (inserted.has(item.id)) {
+                results[item.index] = { id: item.id, duplicate: false }
+                freshQueues.add(item.request.queue)
+              } else if (item.request.id !== undefined) {
+                results[item.index] = { id: item.id, duplicate: true }
+              } else {
+                // Auto/generated id squatted by an existing row: re-draw and
+                // re-insert next round. NOTE this lands the item after its
+                // batch-mates in seq (FIFO) order — acceptable for a
+                // pathological collision, and documented on the contract.
+                pending.push({ request: item.request, index: item.index, id: undefined })
+              }
+            }
+            for (const queue of freshQueues) {
+              yield* wakeUp(queue)
+            }
+          }
+        }
+        const resolved: Array<JobStore.EnqueueResult> = []
+        for (const result of results) {
+          if (result === undefined) {
+            return yield* new JobStore.JobStoreError({
+              message: "enqueueMany failed: could not generate unique job ids"
+            })
+          }
+          resolved.push(result)
+        }
+        return resolved
+      })
+
     const store: JobStore.Service = {
-      enqueue: (request) =>
+      enqueue: enqueueOne,
+
+      enqueueMany: (requests) =>
         Effect.gen(function*() {
-          if (request.dedupe !== undefined) {
-            const result = yield* enqueueDeduped(request, request.dedupe)
-            if (result.wake) {
-              yield* wakeUp("wakeQueue" in result && result.wakeQueue !== undefined ? result.wakeQueue : request.queue)
+          const results: Array<JobStore.EnqueueResult> = []
+          let batch: Array<JobStore.EnqueueRequest> = []
+          const flush = () =>
+            Effect.gen(function*() {
+              if (batch.length === 0) return
+              const items = batch
+              batch = []
+              // No spread: a six-figure batch would blow the engine's
+              // argument-count limit after the rows already committed.
+              for (const result of yield* insertBatch(items)) {
+                results.push(result)
+              }
+            })
+          for (const request of requests) {
+            // Dedup items run through the transactional single-enqueue path
+            // in order; runs of plain items between them batch into one
+            // INSERT with multi-row VALUES.
+            if (request.dedupe !== undefined) {
+              yield* flush()
+              results.push(yield* enqueueOne(request))
+            } else {
+              batch.push(request)
             }
-            return { id: result.id, duplicate: result.duplicate }
-          }
-          const now = yield* nowDate
-          const result = yield* insertJob(db, request, now)
-          if (!result.duplicate) {
-            yield* wakeUp(request.queue)
           }
-          return result
+          yield* flush()
+          return results
         }),
 
       claim: (claimOptions) =>
@@ -709,6 +917,7 @@ export const make = (
                 ${jobs.stalledCount} AS "stalledCount", ${jobs.backoff} AS "backoff",
                 ${jobs.keep} AS "keep", ${jobs.timeoutMs} AS "timeoutMs",
                 ${jobs.cancelRequested} AS "cancelRequested", ${jobs.dedupeKey} AS "dedupeKey",
+                ${jobs.trace} AS "trace",
                 ${jobs.runAt} AS "runAt", ${jobs.enqueuedAt} AS "enqueuedAt",
                 ${jobs.processedAt} AS "processedAt", ${jobs.finishedAt} AS "finishedAt",
                 ${jobs.exit} AS "exit", ${jobs.failedReason} AS "failedReason"
@@ -1064,59 +1273,24 @@ export const make = (
           yield* wakeUp(JobStore.QueueName(rows[0]?.queue ?? ""))
         }),
 
-      cancel: (id) =>
-        db.transaction((tx) =>
-          Effect.gen(function*() {
-            const now = yield* nowDate
-            // One guarded statement: waiting/delayed become terminal, active
-            // gets the cancel-request flag; anything else is reported by state.
-            const rows = rowsOf(yield* tx.execute<
-              {
-                id: string
-                state: string
-                processedAt: Date | null
-                name: string
-                keep: JobStore.KeepPolicy | null
-                dedupeKey: string | null
-              }
-            >(sql`
-              UPDATE ${jobs} SET
-                state = CASE WHEN ${jobs.state} IN ('waiting', 'delayed') THEN 'cancelled' ELSE ${jobs.state} END,
-                finished_at = CASE WHEN ${jobs.state} IN ('waiting', 'delayed') THEN ${now}::timestamptz ELSE ${jobs.finishedAt} END,
-                cancel_requested = CASE WHEN ${jobs.state} = 'active' THEN TRUE ELSE ${jobs.cancelRequested} END
-              WHERE ${jobs.id} = ${id} AND ${jobs.state} IN ('waiting', 'delayed', 'active')
-              RETURNING ${jobs.id} AS id, ${jobs.state} AS state,
-                ${jobs.processedAt} AS "processedAt", ${jobs.name} AS "name", ${jobs.keep} AS "keep",
-                ${jobs.dedupeKey} AS "dedupeKey"
-            `))
-            const row = rows[0]
-            if (row === undefined) {
-              const existing = rowsOf(yield* tx.execute<{ state: JobStore.JobState }>(sql`
-                SELECT ${jobs.state} AS state FROM ${jobs} WHERE ${jobs.id} = ${id}
-              `))
-              const found = existing[0]
-              if (found === undefined) {
-                return yield* new JobStore.JobNotFoundError({ jobId: id })
-              }
-              return yield* new JobStore.JobNotCancellableError({ jobId: id, state: found.state })
-            }
-            if (row.state === "cancelled") {
-              yield* insertAttempt(tx, id, "cancelled", row.processedAt, now, undefined)
-              yield* releaseDedupe(tx, row.name, row.dedupeKey, id, now)
-              yield* applyKeep(tx, { name: row.name, state: "cancelled", keep: row.keep }, now)
-            }
-          })
-        ).pipe(
-          Effect.mapError((error) =>
-            error instanceof JobStore.JobNotFoundError ||
-              error instanceof JobStore.JobNotCancellableError ||
-              error instanceof JobStore.JobStoreError
-              ? error
-              : storeError("cancel failed")(error)
-          ),
-          Effect.asVoid
-        ),
+      cancel: (id) => cancelJob(id),
 
+      cancelByDedupe: (name, key) =>
+        Effect.gen(function*() {
+          const rows = rowsOf(yield* db.execute<{ jobId: string }>(sql`
+            SELECT ${dedupe.jobId} AS "jobId" FROM ${dedupe}
+            WHERE ${dedupe.name} = ${name} AND ${dedupe.key} = ${key}
+          `).pipe(Effect.mapError(storeError("cancelByDedupe failed"))))
+          const jobId = rows[0]?.jobId
+          // "" is the in-transaction placeholder; treat like no entry.
+          if (jobId === undefined || jobId === "") return false
+          return yield* cancelJob(JobId(jobId)).pipe(
+            Effect.as(true),
+            // Idempotent: a vanished or already-terminal keyed job is
+            // "nothing pending", not an error.
+            Effect.catchTag(["JobNotFoundError", "JobNotCancellableError"], () => Effect.succeed(false))
+          )
+        }),
       promote: (id) =>
         Effect.gen(function*() {
           const now = yield* nowDate
@@ -1251,6 +1425,39 @@ export const make = (
           Effect.asVoid
         ),
 
+      tickSchedule: (key, expectedRunAt, nextRunAt, request) =>
+        Effect.gen(function*() {
+          if (request.id === undefined) {
+            return yield* new JobStore.JobStoreError({
+              message: "tickSchedule requires an explicit request.id"
+            })
+          }
+          // One transaction: the nextRunAt CAS claims the slot and the job
+          // INSERT commits with it, so a stale sweeper can never re-fire an
+          // occurrence — even after retention pruned the previous slot's job.
+          const fired = yield* db.transaction((tx) =>
+            Effect.gen(function*() {
+              const claimed = rowsOf(yield* tx.execute<{ key: string }>(sql`
+                UPDATE ${schedules} SET next_run_at = ${new Date(nextRunAt)}
+                WHERE ${schedules.key} = ${key} AND ${schedules.nextRunAt} = ${new Date(expectedRunAt)}
+                RETURNING ${schedules.key} AS key
+              `))
+              if (claimed.length === 0) return false
+              const now = yield* nowDate
+              const result = yield* insertJob(tx, request, now)
+              // A pre-existing slot row (pre-0.4 crash between enqueue and
+              // advance) still advances the schedule but fires nothing new.
+              return !result.duplicate
+            })
+          ).pipe(Effect.mapError((error) =>
+            error instanceof JobStore.JobStoreError ? error : storeError("tickSchedule failed")(error)
+          ))
+          if (fired) {
+            yield* wakeUp(request.queue)
+          }
+          return fired
+        }),
+
       counts: (queue) =>
         db.execute<{ state: JobStore.JobState; count: number }>(sql`
           SELECT ${jobs.state} AS "state", count(*)::int AS "count" FROM ${jobs}

package/src/drizzle-postgres/schema.ts

@@ -55,6 +55,7 @@ type JobState = JobStore.JobState
 type BackoffPolicy = JobStore.BackoffPolicy
 type KeepPolicy = JobStore.KeepPolicy
 type AttemptOutcome = JobStore.AttemptRecord["outcome"]
+type TraceContext = JobStore.TraceContext
 
 /**
  * Table-factory options: `extraConfig` receives the table's columns (exactly
@@ -69,10 +70,10 @@ export interface MqTableOptions<Columns extends Record<string, AnyPgColumnBuilde
     | undefined
 }
 
-const jobsColumns = <JobName extends string>() => ({
+const jobsColumns = <JobName extends string, Queue extends string>() => ({
   id: text("id").primaryKey().$type<JobId>(),
   name: text("name").notNull().$type<JobName>(),
-  queue: text("queue").notNull().$type<QueueName>(),
+  queue: text("queue").notNull().$type<Queue>(),
   state: text("state").notNull().$type<JobState>(),
   priority: integer("priority").notNull().default(0),
   /** FIFO order within a priority; bumped on retry so retries go to the tail. */
@@ -87,6 +88,7 @@ const jobsColumns = <JobName extends string>() => ({
   timeoutMs: bigint("timeout_ms", { mode: "number" }),
   cancelRequested: boolean("cancel_requested").notNull().default(false),
   dedupeKey: text("dedupe_key"),
+  trace: jsonb("trace").$type<TraceContext>(),
   runAt: timestamp("run_at", { withTimezone: true, mode: "date" }).notNull(),
   enqueuedAt: timestamp("enqueued_at", { withTimezone: true, mode: "date" }).notNull(),
   processedAt: timestamp("processed_at", { withTimezone: true, mode: "date" }),
@@ -100,6 +102,8 @@ const jobsColumns = <JobName extends string>() => ({
 /**
  * The jobs table factory. `JobName` types the `name` column — derive it from
  * your job definitions: `mqJobs<typeof GenerateInvoice._tag | typeof Report._tag>()`.
+ * `Queue` types the `queue` column the same way — pass your own branded type
+ * or literal union (defaults to effect-mq's `QueueName` brand).
  *
  * `extend` adds your own columns (tenant ids, object ids, ...) to the table.
  * At enqueue the Postgres store fills each extended column from the job's
@@ -122,16 +126,17 @@ const jobsColumns = <JobName extends string>() => ({
  */
 export const mqJobs = <
   JobName extends string = string,
+  Queue extends string = QueueName,
   Extend extends Record<string, AnyPgColumnBuilder> = Record<never, never>
 >(
   tableName = "effect_mq_jobs",
-  options?: MqTableOptions<ReturnType<typeof jobsColumns<JobName>> & Extend> & {
+  options?: MqTableOptions<ReturnType<typeof jobsColumns<JobName, Queue>> & Extend> & {
     /** Extra columns appended to the factory's own (see the JSDoc example). */
     readonly extend?: Extend | undefined
   }
 ) =>
   pgTable(tableName, {
-    ...jobsColumns<JobName>(),
+    ...jobsColumns<JobName, Queue>(),
     // SAFETY: when `extend` is absent, `Extend` was never inferred from a
     // value and stays at its empty-record default, which {} satisfies.
     ...options?.extend ?? ({} as Extend)
@@ -173,7 +178,7 @@ const attemptsColumns = (jobs: MqJobsTable) => ({
  * @since 0.1.0
  */
 export const mqJobAttempts = (
-  jobs: ReturnType<typeof mqJobs<any>>,
+  jobs: MqJobsTable,
   tableName = "effect_mq_job_attempts",
   options?: MqTableOptions<ReturnType<typeof attemptsColumns>>
 ) =>
@@ -182,10 +187,10 @@ export const mqJobAttempts = (
     ...options?.extraConfig?.(table) ?? []
   ])
 
-const schedulesColumns = () => ({
+const schedulesColumns = <JobName extends string, Queue extends string>() => ({
   key: text("key").primaryKey().$type<ScheduleKey>(),
-  jobName: text("job_name").notNull(),
-  queue: text("queue").notNull().$type<QueueName>(),
+  jobName: text("job_name").notNull().$type<JobName>(),
+  queue: text("queue").notNull().$type<Queue>(),
   cron: text("cron"),
   tz: text("tz"),
   everyMs: bigint("every_ms", { mode: "number" }),
@@ -202,19 +207,22 @@ const schedulesColumns = () => ({
 /**
  * Repeatable-job schedules (one row per `Job.schedule` key).
  *
+ * `JobName` and `Queue` type the `jobName`/`queue` columns, exactly like
+ * `mqJobs` (both default to plain string / effect-mq's `QueueName` brand).
+ *
  * @since 0.2.0
  */
-export const mqSchedules = (
+export const mqSchedules = <JobName extends string = string, Queue extends string = QueueName>(
   tableName = "effect_mq_schedules",
-  options?: MqTableOptions<ReturnType<typeof schedulesColumns>>
+  options?: MqTableOptions<ReturnType<typeof schedulesColumns<JobName, Queue>>>
 ) =>
-  pgTable(tableName, schedulesColumns(), (table) => [
+  pgTable(tableName, schedulesColumns<JobName, Queue>(), (table) => [
     index(`${tableName}_due_idx`).on(table.nextRunAt),
     ...options?.extraConfig?.(table) ?? []
   ])
 
-const dedupeColumns = () => ({
-  name: text("name").notNull(),
+const dedupeColumns = <JobName extends string>() => ({
+  name: text("name").notNull().$type<JobName>(),
   key: text("key").notNull(),
   jobId: text("job_id").notNull().$type<JobId>(),
   /** Set for ttl/throttle windows; NULL rows live as long as their job is pending. */
@@ -226,17 +234,17 @@ const dedupeColumns = () => ({
  *
  * @since 0.3.0
  */
-export const mqDedupe = (
+export const mqDedupe = <JobName extends string = string>(
   tableName = "effect_mq_dedupe",
-  options?: MqTableOptions<ReturnType<typeof dedupeColumns>>
+  options?: MqTableOptions<ReturnType<typeof dedupeColumns<JobName>>>
 ) =>
-  pgTable(tableName, dedupeColumns(), (table) => [
+  pgTable(tableName, dedupeColumns<JobName>(), (table) => [
     primaryKey({ columns: [table.name, table.key] }),
     ...options?.extraConfig?.(table) ?? []
   ])
 
-const queueControlColumns = () => ({
-  queue: text("queue").primaryKey().$type<QueueName>(),
+const queueControlColumns = <Queue extends string>() => ({
+  queue: text("queue").primaryKey().$type<Queue>(),
   paused: boolean("paused").notNull().default(false)
 })
 
@@ -245,18 +253,18 @@ const queueControlColumns = () => ({
  *
  * @since 0.2.0
  */
-export const mqQueueControl = (
+export const mqQueueControl = <Queue extends string = QueueName>(
   tableName = "effect_mq_queue_control",
-  options?: MqTableOptions<ReturnType<typeof queueControlColumns>>
+  options?: MqTableOptions<ReturnType<typeof queueControlColumns<Queue>>>
 ) =>
-  pgTable(tableName, queueControlColumns(), (table) => [
+  pgTable(tableName, queueControlColumns<Queue>(), (table) => [
     ...options?.extraConfig?.(table) ?? []
   ])
 
 /**
  * @since 0.1.0
  */
-export type MqJobsTable = ReturnType<typeof mqJobs<any>>
+export type MqJobsTable = ReturnType<typeof mqJobs<any, any>>
 
 /**
  * @since 0.1.0
@@ -266,14 +274,14 @@ export type MqJobAttemptsTable = ReturnType<typeof mqJobAttempts>
 /**
  * @since 0.2.0
  */
-export type MqSchedulesTable = ReturnType<typeof mqSchedules>
+export type MqSchedulesTable = ReturnType<typeof mqSchedules<any, any>>
 
 /**
  * @since 0.2.0
  */
-export type MqQueueControlTable = ReturnType<typeof mqQueueControl>
+export type MqQueueControlTable = ReturnType<typeof mqQueueControl<any>>
 
 /**
  * @since 0.3.0
  */
-export type MqDedupeTable = ReturnType<typeof mqDedupe>
+export type MqDedupeTable = ReturnType<typeof mqDedupe<any>>