@pgpm/database-jobs 0.21.0 → 0.22.0

package/Makefile

@@ -1,5 +1,5 @@
 EXTENSION = pgpm-database-jobs
-DATA = sql/pgpm-database-jobs--0.15.3.sql
+DATA = sql/pgpm-database-jobs--0.22.0.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/deploy/schemas/app_jobs/procedures/add_job.sql

@@ -2,10 +2,11 @@
 -- requires: schemas/app_jobs/schema
 -- requires: schemas/app_jobs/tables/jobs/table
 -- requires: schemas/app_jobs/tables/job_queues/table
+-- requires: pgpm-jwt-claims:schemas/jwt_private/procedures/current_database_id
+-- requires: pgpm-jwt-claims:schemas/jwt_public/procedures/current_user_id
 
 BEGIN;
 CREATE FUNCTION app_jobs.add_job (
-  db_id uuid,
   identifier text,
   payload json DEFAULT '{}' ::json,
   job_key text DEFAULT NULL,
@@ -18,14 +19,18 @@ CREATE FUNCTION app_jobs.add_job (
   AS $$
 DECLARE
   v_job app_jobs.jobs;
+  v_database_id uuid;
+  v_actor_id uuid;
 BEGIN
-  -- Bake actor_id into payload
-  payload := (coalesce(payload, '{}'::json)::jsonb || jsonb_build_object('actor_id', jwt_public.current_user_id()))::json;
+  -- Read context from JWT claims
+  v_database_id := jwt_private.current_database_id();
+  v_actor_id := jwt_public.current_user_id();
 
   IF job_key IS NOT NULL THEN
-    -- Upsert job	
+    -- Upsert job
     INSERT INTO app_jobs.jobs (
       database_id,
+      actor_id,
       task_identifier,
       payload,
       queue_name,
@@ -34,52 +39,51 @@ BEGIN
       key,
       priority
     ) VALUES (
-        db_id,
+        v_database_id,
+        v_actor_id,
         identifier,
-        coalesce(payload,
-        '{}'::json),
+        coalesce(payload, '{}'::json),
         queue_name,
         coalesce(run_at, now()),
         coalesce(max_attempts, 25),
         job_key,
         coalesce(priority, 0)
-    )	
-    ON CONFLICT (key)	
-      DO UPDATE SET	
+    )
+    ON CONFLICT (key)
+      DO UPDATE SET
         task_identifier = EXCLUDED.task_identifier,
         payload = EXCLUDED.payload,
         queue_name = EXCLUDED.queue_name,
         max_attempts = EXCLUDED.max_attempts,
         run_at = EXCLUDED.run_at,
-        priority = EXCLUDED.priority,	
-        -- always reset error/retry state	
-        attempts = 0, last_error = NULL	
-      WHERE	
-        jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
+        priority = EXCLUDED.priority,
+        -- always reset error/retry state
+        attempts = 0, last_error = NULL
+      WHERE
+        jobs.locked_at IS NULL
+      RETURNING
+        * INTO v_job;
 
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
+    -- If upsert succeeded (insert or update), return early
+    IF NOT (v_job IS NULL) THEN
+      RETURN v_job;
+    END IF;
 
-    -- Upsert failed -> there must be an existing job that is locked. Remove	
-    -- existing key to allow a new one to be inserted, and prevent any	
+    -- Upsert failed -> there must be an existing job that is locked. Remove
+    -- existing key to allow a new one to be inserted, and prevent any
     -- subsequent retries by bumping attempts to the max allowed.
-
-    UPDATE	
-      app_jobs.jobs	
-    SET	
-      KEY = NULL,	
-      attempts = jobs.max_attempts	
-    WHERE	
-      KEY = job_key;	
+    UPDATE
+      app_jobs.jobs
+    SET
+      key = NULL,
+      attempts = jobs.max_attempts
+    WHERE
+      key = job_key;
   END IF;
 
   INSERT INTO app_jobs.jobs (
     database_id,
+    actor_id,
     task_identifier,
     payload,
     queue_name,
@@ -87,7 +91,8 @@ BEGIN
     max_attempts,
     priority
   ) VALUES (
-    db_id,
+    v_database_id,
+    v_actor_id,
     identifier,
     payload,
     queue_name,
@@ -103,4 +108,3 @@ $$
 LANGUAGE 'plpgsql' VOLATILE SECURITY DEFINER;
 
 COMMIT;
-

package/deploy/schemas/app_jobs/procedures/add_scheduled_job.sql

@@ -2,11 +2,12 @@
 
 -- requires: schemas/app_jobs/schema
 -- requires: schemas/app_jobs/tables/scheduled_jobs/table
+-- requires: pgpm-jwt-claims:schemas/jwt_private/procedures/current_database_id
+-- requires: pgpm-jwt-claims:schemas/jwt_public/procedures/current_user_id
 
 BEGIN;
 
 CREATE FUNCTION app_jobs.add_scheduled_job(
-  db_id uuid,
   identifier text,
   payload json DEFAULT '{}'::json,
   schedule_info json DEFAULT '{}'::json,
@@ -19,12 +20,18 @@ CREATE FUNCTION app_jobs.add_scheduled_job(
   AS $$
 DECLARE
   v_job app_jobs.scheduled_jobs;
+  v_database_id uuid;
+  v_actor_id uuid;
 BEGIN
+  v_database_id := jwt_private.current_database_id();
+  v_actor_id := jwt_public.current_user_id();
+
   IF job_key IS NOT NULL THEN
 
-    -- Upsert job	
+    -- Upsert job
     INSERT INTO app_jobs.scheduled_jobs (
       database_id,
+      actor_id,
       task_identifier,
       payload,
       queue_name,
@@ -33,7 +40,8 @@ BEGIN
       key,
       priority
       ) VALUES (
-        db_id,
+        v_database_id,
+        v_actor_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -41,37 +49,38 @@ BEGIN
         coalesce(max_attempts, 25),
         job_key,
         coalesce(priority, 0)
-    )	
-    ON CONFLICT (key)	
-      DO UPDATE SET	
+    )
+    ON CONFLICT (key)
+      DO UPDATE SET
         task_identifier = EXCLUDED.task_identifier,
         payload = EXCLUDED.payload,
         queue_name = EXCLUDED.queue_name,
         max_attempts = EXCLUDED.max_attempts,
         schedule_info = EXCLUDED.schedule_info,
         priority = EXCLUDED.priority
-      WHERE	
-        scheduled_jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
+      WHERE
+        scheduled_jobs.locked_at IS NULL
+      RETURNING
+        * INTO v_job;
+
+    -- If upsert succeeded (insert or update), return early
 
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
+    IF NOT (v_job IS NULL) THEN
+      RETURN v_job;
+    END IF;
 
-    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove	
+    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove
     -- and allow a new one to be inserted
 
-    DELETE FROM	
-      app_jobs.scheduled_jobs	
-    WHERE	
-      KEY = job_key;	
+    DELETE FROM
+      app_jobs.scheduled_jobs
+    WHERE
+      KEY = job_key;
   END IF;
 
   INSERT INTO app_jobs.scheduled_jobs (
     database_id,
+    actor_id,
     task_identifier,
     payload,
     queue_name,
@@ -79,7 +88,8 @@ BEGIN
     max_attempts,
     priority
     ) VALUES (
-    db_id,
+    v_database_id,
+    v_actor_id,
     identifier,
     payload,
     queue_name,

package/deploy/schemas/app_jobs/procedures/force_unlock_workers.sql

@@ -0,0 +1,20 @@
+-- Deploy schemas/app_jobs/procedures/force_unlock_workers to pg
+-- requires: schemas/app_jobs/schema
+-- requires: schemas/app_jobs/tables/jobs/table
+-- requires: schemas/app_jobs/tables/job_queues/table
+
+BEGIN;
+CREATE FUNCTION app_jobs.force_unlock_workers (worker_ids text[])
+  RETURNS void
+  LANGUAGE sql
+  VOLATILE
+  AS $$
+  UPDATE app_jobs.jobs
+  SET locked_at = NULL, locked_by = NULL
+  WHERE locked_by = ANY (worker_ids);
+
+  UPDATE app_jobs.job_queues
+  SET locked_at = NULL, locked_by = NULL
+  WHERE locked_by = ANY (worker_ids);
+$$;
+COMMIT;

package/deploy/schemas/app_jobs/procedures/get_job.sql

@@ -4,7 +4,11 @@
 -- requires: schemas/app_jobs/tables/jobs/table
 
 BEGIN;
-CREATE FUNCTION app_jobs.get_job (worker_id text, task_identifiers text[] DEFAULT NULL, job_expiry interval DEFAULT '4 hours')
+CREATE FUNCTION app_jobs.get_job (
+  worker_id text,
+  task_identifiers text[] DEFAULT NULL,
+  job_expiry interval DEFAULT '4 hours'
+)
   RETURNS app_jobs.jobs
   LANGUAGE plpgsql
   AS $$
@@ -14,79 +18,51 @@ DECLARE
   v_row app_jobs.jobs;
   v_now timestamptz = now();
 BEGIN
-
   IF worker_id IS NULL THEN
-    RAISE exception 'INVALID_WORKER_ID';
+    RAISE EXCEPTION 'INVALID_WORKER_ID';
   END IF;
 
-  --
-
-  SELECT
-    jobs.queue_name,
-    jobs.id INTO v_queue_name,
-    v_job_id
-  FROM
-    app_jobs.jobs
-  WHERE (jobs.locked_at IS NULL
-    OR jobs.locked_at < (v_now - job_expiry))
+  SELECT jobs.queue_name, jobs.id
+    INTO v_queue_name, v_job_id
+  FROM app_jobs.jobs
+  WHERE is_available = true
+    AND (jobs.locked_at IS NULL
+      OR jobs.locked_at < (v_now - job_expiry))
     AND (jobs.queue_name IS NULL
-      OR EXISTS (
-        SELECT
-          1
-        FROM
-          app_jobs.job_queues
-        WHERE
-          job_queues.queue_name = jobs.queue_name
-          AND (job_queues.locked_at IS NULL
-            OR job_queues.locked_at < (v_now - job_expiry))
-        FOR UPDATE
-          SKIP LOCKED))
+      OR jobs.queue_name IN (
+        SELECT jq.queue_name
+        FROM app_jobs.job_queues jq
+        WHERE (jq.locked_at IS NULL
+            OR jq.locked_at < (v_now - job_expiry))
+        FOR UPDATE SKIP LOCKED
+      ))
     AND run_at <= v_now
     AND attempts < max_attempts
     AND (task_identifiers IS NULL
       OR task_identifier = ANY (task_identifiers))
-  ORDER BY
-    priority ASC,
-    run_at ASC,
-    id ASC
+  ORDER BY priority ASC, run_at ASC, id ASC
   LIMIT 1
-  FOR UPDATE
-    SKIP LOCKED;
-
-  --
+  FOR UPDATE SKIP LOCKED;
 
   IF v_job_id IS NULL THEN
     RETURN NULL;
   END IF;
 
-  --
-
   IF v_queue_name IS NOT NULL THEN
-    UPDATE
-      app_jobs.job_queues
-    SET
-      locked_by = worker_id,
-      locked_at = v_now
-    WHERE
-      job_queues.queue_name = v_queue_name;
+    UPDATE app_jobs.job_queues
+    SET locked_by = worker_id, locked_at = v_now
+    WHERE job_queues.queue_name = v_queue_name;
   END IF;
 
-  --
-
-  UPDATE
-    app_jobs.jobs
+  UPDATE app_jobs.jobs
   SET
     attempts = attempts + 1,
     locked_by = worker_id,
     locked_at = v_now
-  WHERE
-    id = v_job_id
-  RETURNING
-    * INTO v_row;
+  WHERE id = v_job_id
+  RETURNING * INTO v_row;
 
-  --
   RETURN v_row;
 END;
 $$;
 COMMIT;
-

package/deploy/schemas/app_jobs/procedures/remove_job.sql

@@ -0,0 +1,34 @@
+-- Deploy schemas/app_jobs/procedures/remove_job to pg
+-- requires: schemas/app_jobs/schema
+-- requires: schemas/app_jobs/tables/jobs/table
+
+BEGIN;
+CREATE FUNCTION app_jobs.remove_job (job_key text)
+  RETURNS app_jobs.jobs
+  LANGUAGE plpgsql
+  STRICT
+  AS $$
+DECLARE
+  v_job app_jobs.jobs;
+BEGIN
+  DELETE FROM app_jobs.jobs
+  WHERE key = job_key
+    AND (locked_at IS NULL
+      OR locked_at < NOW() - interval '4 hours')
+  RETURNING * INTO v_job;
+
+  IF NOT (v_job IS NULL) THEN
+    RETURN v_job;
+  END IF;
+
+  UPDATE app_jobs.jobs
+  SET
+    key = NULL,
+    attempts = jobs.max_attempts
+  WHERE key = job_key
+  RETURNING * INTO v_job;
+
+  RETURN v_job;
+END;
+$$;
+COMMIT;

package/deploy/schemas/app_jobs/procedures/run_scheduled_job.sql

@@ -41,6 +41,7 @@ BEGIN
   -- insert new job
   INSERT INTO app_jobs.jobs (
     database_id,
+    actor_id,
     queue_name,
     task_identifier,
     payload,
@@ -49,6 +50,7 @@ BEGIN
     key
   ) SELECT
     database_id,
+    actor_id,
     queue_name,
     task_identifier,
     payload,

package/deploy/schemas/app_jobs/tables/jobs/indexes/priority_run_at_id_idx.sql

@@ -3,6 +3,15 @@
 -- requires: schemas/app_jobs/tables/jobs/table
 
 BEGIN;
-CREATE INDEX priority_run_at_id_idx ON app_jobs.jobs (priority, run_at, id);
-COMMIT;
 
+CREATE INDEX jobs_main_index
+  ON app_jobs.jobs USING btree (priority, run_at)
+  INCLUDE (id, queue_name)
+  WHERE (is_available = true);
+
+CREATE INDEX jobs_no_queue_index
+  ON app_jobs.jobs USING btree (priority, run_at)
+  INCLUDE (id)
+  WHERE (is_available = true AND queue_name IS NULL);
+
+COMMIT;

package/deploy/schemas/app_jobs/tables/jobs/table.sql

@@ -4,8 +4,9 @@
 BEGIN;
 CREATE TABLE app_jobs.jobs (
   id bigserial PRIMARY KEY,
-  database_id uuid NOT NULL,
-  queue_name text DEFAULT (public.gen_random_uuid ()) ::text,
+  database_id uuid,
+  actor_id uuid,
+  queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload json DEFAULT '{}' ::json NOT NULL,
   priority integer DEFAULT 0 NOT NULL,
@@ -16,17 +17,19 @@ CREATE TABLE app_jobs.jobs (
   last_error text,
   locked_at timestamptz,
   locked_by text,
+  is_available boolean GENERATED ALWAYS AS ((locked_at IS NULL) AND (attempts < max_attempts)) STORED NOT NULL,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
-  CHECK (max_attempts > 0),
+  CHECK (max_attempts >= 1),
   CHECK (length(queue_name) < 127),
   CHECK (length(locked_by) > 3),
   UNIQUE (key)
 );
 
-COMMENT ON TABLE app_jobs.jobs IS 'Background job queue with database scoping: each row is a pending or in-progress task for a specific database';
+COMMENT ON TABLE app_jobs.jobs IS 'Background job queue: each row is a pending or in-progress task, optionally scoped to a database';
 COMMENT ON COLUMN app_jobs.jobs.id IS 'Auto-incrementing job identifier';
-COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to, for multi-tenant job isolation';
+COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to (nullable for system-level jobs without tenant context)';
+COMMENT ON COLUMN app_jobs.jobs.actor_id IS 'User who triggered this job, read from JWT claims at enqueue time';
 COMMENT ON COLUMN app_jobs.jobs.queue_name IS 'Name of the queue this job belongs to; used for worker routing and concurrency control';
 COMMENT ON COLUMN app_jobs.jobs.task_identifier IS 'Identifier for the task type (maps to a worker handler function)';
 COMMENT ON COLUMN app_jobs.jobs.payload IS 'JSON payload of arguments passed to the task handler';
@@ -38,6 +41,7 @@ COMMENT ON COLUMN app_jobs.jobs.key IS 'Optional unique deduplication key; preve
 COMMENT ON COLUMN app_jobs.jobs.last_error IS 'Error message from the most recent failed attempt';
 COMMENT ON COLUMN app_jobs.jobs.locked_at IS 'Timestamp when a worker locked this job for processing';
 COMMENT ON COLUMN app_jobs.jobs.locked_by IS 'Identifier of the worker that currently holds the lock';
+COMMENT ON COLUMN app_jobs.jobs.is_available IS 'Generated column: true when job is unlocked and has remaining attempts';
 
 COMMIT;
 

package/deploy/schemas/app_jobs/tables/jobs/triggers/notify_worker.sql

@@ -5,9 +5,19 @@
 -- requires: schemas/app_jobs/tables/jobs/triggers/increase_job_queue_count
 
 BEGIN;
-CREATE TRIGGER _900_notify_worker
-    AFTER INSERT ON app_jobs.jobs
-    FOR EACH ROW
-    EXECUTE PROCEDURE app_jobs.do_notify ('jobs:insert');
-COMMIT;
+CREATE FUNCTION app_jobs.tg_jobs__after_insert ()
+  RETURNS TRIGGER
+  AS $$
+BEGIN
+  PERFORM
+    pg_notify('jobs:insert', '');
+  RETURN NULL;
+END;
+$$
+LANGUAGE plpgsql;
 
+CREATE TRIGGER _900_after_insert
+  AFTER INSERT ON app_jobs.jobs
+  FOR EACH STATEMENT
+  EXECUTE PROCEDURE app_jobs.tg_jobs__after_insert ();
+COMMIT;

package/deploy/schemas/app_jobs/tables/scheduled_jobs/table.sql

@@ -4,8 +4,9 @@
 BEGIN;
 CREATE TABLE app_jobs.scheduled_jobs (
   id bigserial PRIMARY KEY,
-  database_id uuid NOT NULL,
-  queue_name text DEFAULT (public.gen_random_uuid ()) ::text,
+  database_id uuid,
+  actor_id uuid,
+  queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload json DEFAULT '{}' ::json NOT NULL,
   priority integer DEFAULT 0 NOT NULL,
@@ -18,15 +19,16 @@ CREATE TABLE app_jobs.scheduled_jobs (
   last_scheduled_id bigint,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
-  CHECK (max_attempts > 0),
+  CHECK (max_attempts >= 1),
   CHECK (length(queue_name) < 127),
   CHECK (length(locked_by) > 3),
   UNIQUE (key)
 );
 
-COMMENT ON TABLE app_jobs.scheduled_jobs IS 'Recurring/cron-style job definitions with database scoping: each row spawns jobs on a schedule for a specific database';
+COMMENT ON TABLE app_jobs.scheduled_jobs IS 'Recurring/cron-style job definitions: each row spawns jobs on a schedule, optionally scoped to a database';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.id IS 'Auto-incrementing scheduled job identifier';
-COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this scheduled job belongs to, for multi-tenant isolation';
+COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this scheduled job belongs to (nullable for system-level schedules without tenant context)';
+COMMENT ON COLUMN app_jobs.scheduled_jobs.actor_id IS 'User who created this scheduled job, read from JWT claims at creation time';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.queue_name IS 'Name of the queue spawned jobs are placed into';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.task_identifier IS 'Task type identifier for spawned jobs';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.payload IS 'JSON payload passed to each spawned job';

package/deploy/schemas/app_jobs/triggers/tg_add_job_with_fields.sql

@@ -34,7 +34,7 @@ BEGIN
       END IF;
     END LOOP;
   PERFORM
-    app_jobs.add_job (jwt_private.current_database_id(), fn, app_jobs.json_build_object_apply (args));
+    app_jobs.add_job (fn, app_jobs.json_build_object_apply (args));
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     RETURN NEW;
   END IF;

package/deploy/schemas/app_jobs/triggers/tg_add_job_with_row.sql

@@ -8,12 +8,12 @@ CREATE FUNCTION app_jobs.tg_add_job_with_row ()
 BEGIN
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), TG_ARGV[0], to_json(NEW));
+      app_jobs.add_job (TG_ARGV[0], to_json(NEW));
     RETURN NEW;
   END IF;
   IF (TG_OP = 'DELETE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), TG_ARGV[0], to_json(OLD));
+      app_jobs.add_job (TG_ARGV[0], to_json(OLD));
     RETURN OLD;
   END IF;
 END;

package/deploy/schemas/app_jobs/triggers/tg_add_job_with_row_id.sql

@@ -9,12 +9,12 @@ CREATE FUNCTION app_jobs.tg_add_job_with_row_id ()
 BEGIN
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), tg_argv[0], json_build_object('id', NEW.id));
+      app_jobs.add_job (tg_argv[0], json_build_object('id', NEW.id));
     RETURN NEW;
   END IF;
   IF (TG_OP = 'DELETE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), tg_argv[0], json_build_object('id', OLD.id));
+      app_jobs.add_job (tg_argv[0], json_build_object('id', OLD.id));
     RETURN OLD;
   END IF;
 END;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/database-jobs",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Database-specific job handling and queue management",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -21,10 +21,11 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "pgpm": "^4.2.3"
+    "pgpm": "^4.23.2"
   },
   "dependencies": {
-    "@pgpm/verify": "0.21.0"
+    "@pgpm/jwt-claims": "0.22.0",
+    "@pgpm/verify": "0.22.0"
   },
   "repository": {
     "type": "git",
@@ -34,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "f79dd69a3f7bac456bbd4474262b0ccbdb3e66a3"
+  "gitHead": "96ae0195a8b3a3dd056808c344f0e3c31a199e5e"
 }

package/pgpm-database-jobs.control

@@ -1,8 +1,8 @@
 # pgpm-database-jobs extension
 comment = 'pgpm-database-jobs extension'
-default_version = '0.15.5'
+default_version = '0.22.0'
 module_pathname = '$libdir/pgpm-database-jobs'
-requires = 'plpgsql,pgcrypto,pgpm-verify'
+requires = 'plpgsql,pgcrypto,pgpm-verify,pgpm-jwt-claims'
 relocatable = false
 superuser = false
   

package/pgpm.plan

@@ -34,5 +34,7 @@ schemas/app_jobs/procedures/get_job [schemas/app_jobs/schema schemas/app_jobs/ta
 schemas/app_jobs/procedures/fail_job [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table schemas/app_jobs/tables/job_queues/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/fail_job
 schemas/app_jobs/procedures/complete_jobs [schemas/app_jobs/schema schemas/app_jobs/tables/job_queues/table schemas/app_jobs/tables/jobs/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/complete_jobs
 schemas/app_jobs/procedures/complete_job [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table schemas/app_jobs/tables/job_queues/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/complete_job
-schemas/app_jobs/procedures/add_scheduled_job [schemas/app_jobs/schema schemas/app_jobs/tables/scheduled_jobs/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/add_scheduled_job
-schemas/app_jobs/procedures/add_job [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table schemas/app_jobs/tables/job_queues/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/add_job
+schemas/app_jobs/procedures/add_scheduled_job [schemas/app_jobs/schema schemas/app_jobs/tables/scheduled_jobs/table pgpm-jwt-claims:schemas/jwt_private/procedures/current_database_id] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/add_scheduled_job
+schemas/app_jobs/procedures/add_job [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table schemas/app_jobs/tables/job_queues/table pgpm-jwt-claims:schemas/jwt_private/procedures/current_database_id pgpm-jwt-claims:schemas/jwt_public/procedures/current_user_id] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/add_job
+schemas/app_jobs/procedures/remove_job [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/remove_job
+schemas/app_jobs/procedures/force_unlock_workers [schemas/app_jobs/schema schemas/app_jobs/tables/jobs/table schemas/app_jobs/tables/job_queues/table] 2025-08-26T23:57:41Z pgpm <pgpm@5b0c196eeb62> # add schemas/app_jobs/procedures/force_unlock_workers

package/revert/schemas/app_jobs/procedures/force_unlock_workers.sql

@@ -0,0 +1,7 @@
+-- Revert schemas/app_jobs/procedures/force_unlock_workers from pg
+
+BEGIN;
+
+DROP FUNCTION app_jobs.force_unlock_workers;
+
+COMMIT;

package/revert/schemas/app_jobs/procedures/remove_job.sql

@@ -0,0 +1,7 @@
+-- Revert schemas/app_jobs/procedures/remove_job from pg
+
+BEGIN;
+
+DROP FUNCTION app_jobs.remove_job;
+
+COMMIT;

package/revert/schemas/app_jobs/tables/jobs/indexes/priority_run_at_id_idx.sql

@@ -2,6 +2,8 @@
 
 BEGIN;
 
-DROP INDEX app_jobs.priority_run_at_id_idx;
+DROP INDEX IF EXISTS app_jobs.priority_run_at_id_idx;
+DROP INDEX IF EXISTS app_jobs.jobs_main_index;
+DROP INDEX IF EXISTS app_jobs.jobs_no_queue_index;
 
 COMMIT;

package/revert/schemas/app_jobs/tables/jobs/triggers/notify_worker.sql

@@ -1,5 +1,6 @@
 -- Revert schemas/app_jobs/tables/jobs/triggers/notify_worker from pg
 BEGIN;
-DROP TRIGGER _900_notify_worker ON app_jobs.jobs;
+DROP TRIGGER IF EXISTS _900_notify_worker ON app_jobs.jobs;
+DROP TRIGGER IF EXISTS _900_after_insert ON app_jobs.jobs;
+DROP FUNCTION IF EXISTS app_jobs.tg_jobs__after_insert;
 COMMIT;
-

package/sql/{pgpm-database-jobs--0.15.3.sql → pgpm-database-jobs--0.22.0.sql}

@@ -23,12 +23,12 @@ CREATE FUNCTION app_jobs.tg_add_job_with_row_id() RETURNS trigger AS $EOFCODE$
 BEGIN
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), tg_argv[0], json_build_object('id', NEW.id));
+      app_jobs.add_job (tg_argv[0], json_build_object('id', NEW.id));
     RETURN NEW;
   END IF;
   IF (TG_OP = 'DELETE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), tg_argv[0], json_build_object('id', OLD.id));
+      app_jobs.add_job (tg_argv[0], json_build_object('id', OLD.id));
     RETURN OLD;
   END IF;
 END;
@@ -40,12 +40,12 @@ CREATE FUNCTION app_jobs.tg_add_job_with_row() RETURNS trigger AS $EOFCODE$
 BEGIN
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), TG_ARGV[0], to_json(NEW));
+      app_jobs.add_job (TG_ARGV[0], to_json(NEW));
     RETURN NEW;
   END IF;
   IF (TG_OP = 'DELETE') THEN
     PERFORM
-      app_jobs.add_job (jwt_private.current_database_id(), TG_ARGV[0], to_json(OLD));
+      app_jobs.add_job (TG_ARGV[0], to_json(OLD));
     RETURN OLD;
   END IF;
 END;
@@ -102,7 +102,7 @@ BEGIN
       END IF;
     END LOOP;
   PERFORM
-    app_jobs.add_job (jwt_private.current_database_id(), fn, app_jobs.json_build_object_apply (args));
+    app_jobs.add_job (fn, app_jobs.json_build_object_apply (args));
   IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
     RETURN NEW;
   END IF;
@@ -114,8 +114,9 @@ $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
 CREATE TABLE app_jobs.scheduled_jobs (
   id bigserial PRIMARY KEY,
-  database_id uuid NOT NULL,
-  queue_name text DEFAULT (public.gen_random_uuid())::text,
+  database_id uuid,
+  actor_id uuid,
+  queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
   priority int DEFAULT 0 NOT NULL,
@@ -128,25 +129,40 @@ CREATE TABLE app_jobs.scheduled_jobs (
   last_scheduled_id bigint,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
-  CHECK (max_attempts > 0),
+  CHECK (max_attempts >= 1),
   CHECK (length(queue_name) < 127),
   CHECK (length(locked_by) > 3),
   UNIQUE (key)
 );
 
-COMMENT ON TABLE app_jobs.scheduled_jobs IS 'Recurring/cron-style job definitions with database scoping: each row spawns jobs on a schedule for a specific database';
+COMMENT ON TABLE app_jobs.scheduled_jobs IS 'Recurring/cron-style job definitions: each row spawns jobs on a schedule, optionally scoped to a database';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.id IS 'Auto-incrementing scheduled job identifier';
-COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this scheduled job belongs to, for multi-tenant isolation';
+
+COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this scheduled job belongs to (nullable for system-level schedules without tenant context)';
+
+COMMENT ON COLUMN app_jobs.scheduled_jobs.actor_id IS 'User who created this scheduled job, read from JWT claims at creation time';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.queue_name IS 'Name of the queue spawned jobs are placed into';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.task_identifier IS 'Task type identifier for spawned jobs';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.payload IS 'JSON payload passed to each spawned job';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.priority IS 'Priority assigned to spawned jobs (lower = higher priority)';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.max_attempts IS 'Max retry attempts for spawned jobs';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.key IS 'Optional unique deduplication key';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.locked_at IS 'Timestamp when the scheduler locked this record for processing';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.locked_by IS 'Identifier of the scheduler worker holding the lock';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.schedule_info IS 'JSON schedule configuration (e.g. cron expression, interval)';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.last_scheduled IS 'Timestamp when a job was last spawned from this schedule';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.last_scheduled_id IS 'ID of the last job spawned from this schedule';
 
 CREATE FUNCTION app_jobs.do_notify() RETURNS trigger AS $EOFCODE$
@@ -171,8 +187,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.scheduled_jobs TO administrator
 
 CREATE TABLE app_jobs.jobs (
   id bigserial PRIMARY KEY,
-  database_id uuid NOT NULL,
-  queue_name text DEFAULT (public.gen_random_uuid())::text,
+  database_id uuid,
+  actor_id uuid,
+  queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
   priority int DEFAULT 0 NOT NULL,
@@ -183,29 +200,48 @@ CREATE TABLE app_jobs.jobs (
   last_error text,
   locked_at timestamptz,
   locked_by text,
+  is_available boolean GENERATED ALWAYS AS (locked_at IS NULL
+    AND attempts < max_attempts) STORED NOT NULL,
   CHECK (length(key) < 513),
   CHECK (length(task_identifier) < 127),
-  CHECK (max_attempts > 0),
+  CHECK (max_attempts >= 1),
   CHECK (length(queue_name) < 127),
   CHECK (length(locked_by) > 3),
   UNIQUE (key)
 );
 
-COMMENT ON TABLE app_jobs.jobs IS 'Background job queue with database scoping: each row is a pending or in-progress task for a specific database';
+COMMENT ON TABLE app_jobs.jobs IS 'Background job queue: each row is a pending or in-progress task, optionally scoped to a database';
+
 COMMENT ON COLUMN app_jobs.jobs.id IS 'Auto-incrementing job identifier';
-COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to, for multi-tenant job isolation';
+
+COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to (nullable for system-level jobs without tenant context)';
+
+COMMENT ON COLUMN app_jobs.jobs.actor_id IS 'User who triggered this job, read from JWT claims at enqueue time';
+
 COMMENT ON COLUMN app_jobs.jobs.queue_name IS 'Name of the queue this job belongs to; used for worker routing and concurrency control';
+
 COMMENT ON COLUMN app_jobs.jobs.task_identifier IS 'Identifier for the task type (maps to a worker handler function)';
+
 COMMENT ON COLUMN app_jobs.jobs.payload IS 'JSON payload of arguments passed to the task handler';
+
 COMMENT ON COLUMN app_jobs.jobs.priority IS 'Execution priority; lower numbers run first (default 0)';
+
 COMMENT ON COLUMN app_jobs.jobs.run_at IS 'Earliest time this job should be executed; used for delayed/scheduled execution';
+
 COMMENT ON COLUMN app_jobs.jobs.attempts IS 'Number of times this job has been attempted so far';
+
 COMMENT ON COLUMN app_jobs.jobs.max_attempts IS 'Maximum retry attempts before the job is considered permanently failed';
+
 COMMENT ON COLUMN app_jobs.jobs.key IS 'Optional unique deduplication key; prevents duplicate jobs with the same key';
+
 COMMENT ON COLUMN app_jobs.jobs.last_error IS 'Error message from the most recent failed attempt';
+
 COMMENT ON COLUMN app_jobs.jobs.locked_at IS 'Timestamp when a worker locked this job for processing';
+
 COMMENT ON COLUMN app_jobs.jobs.locked_by IS 'Identifier of the worker that currently holds the lock';
 
+COMMENT ON COLUMN app_jobs.jobs.is_available IS 'Generated column: true when job is unlocked and has remaining attempts';
+
 ALTER TABLE app_jobs.jobs 
   ADD COLUMN created_at timestamptz;
 
@@ -250,11 +286,19 @@ CREATE TRIGGER _500_increase_job_queue_count_on_update
     AND new.queue_name IS NOT NULL)
   EXECUTE PROCEDURE app_jobs.tg_increase_job_queue_count();
 
-CREATE TRIGGER _900_notify_worker
+CREATE FUNCTION app_jobs.tg_jobs__after_insert() RETURNS trigger AS $EOFCODE$
+BEGIN
+  PERFORM
+    pg_notify('jobs:insert', '');
+  RETURN NULL;
+END;
+$EOFCODE$ LANGUAGE plpgsql;
+
+CREATE TRIGGER _900_after_insert
   AFTER INSERT
   ON app_jobs.jobs
-  FOR EACH ROW
-  EXECUTE PROCEDURE app_jobs.do_notify('jobs:insert');
+  FOR EACH STATEMENT
+  EXECUTE PROCEDURE app_jobs.tg_jobs__after_insert();
 
 CREATE FUNCTION app_jobs.tg_decrease_job_queue_count() RETURNS trigger AS $EOFCODE$
 DECLARE
@@ -292,7 +336,10 @@ CREATE TRIGGER decrease_job_queue_count_on_update
     AND old.queue_name IS NOT NULL)
   EXECUTE PROCEDURE app_jobs.tg_decrease_job_queue_count();
 
-CREATE INDEX priority_run_at_id_idx ON app_jobs.jobs (priority, run_at, id);
+CREATE INDEX jobs_main_index ON app_jobs.jobs (priority, run_at) INCLUDE (id, queue_name) WHERE is_available = true;
+
+CREATE INDEX jobs_no_queue_index ON app_jobs.jobs (priority, run_at) INCLUDE (id) WHERE is_available = true
+  AND queue_name IS NULL;
 
 CREATE INDEX jobs_locked_by_idx ON app_jobs.jobs (locked_by);
 
@@ -306,9 +353,13 @@ CREATE TABLE app_jobs.job_queues (
 );
 
 COMMENT ON TABLE app_jobs.job_queues IS 'Queue metadata: tracks job counts and locking state for each named queue';
+
 COMMENT ON COLUMN app_jobs.job_queues.queue_name IS 'Unique name identifying this queue';
+
 COMMENT ON COLUMN app_jobs.job_queues.job_count IS 'Number of pending jobs in this queue';
+
 COMMENT ON COLUMN app_jobs.job_queues.locked_at IS 'Timestamp when this queue was locked for batch processing';
+
 COMMENT ON COLUMN app_jobs.job_queues.locked_by IS 'Identifier of the worker that currently holds the queue lock';
 
 CREATE INDEX job_queues_locked_by_idx ON app_jobs.job_queues (locked_by);
@@ -350,6 +401,7 @@ BEGIN
   -- insert new job
   INSERT INTO app_jobs.jobs (
     database_id,
+    actor_id,
     queue_name,
     task_identifier,
     payload,
@@ -358,6 +410,7 @@ BEGIN
     key
   ) SELECT
     database_id,
+    actor_id,
     queue_name,
     task_identifier,
     payload,
@@ -510,77 +563,50 @@ DECLARE
   v_row app_jobs.jobs;
   v_now timestamptz = now();
 BEGIN
-
   IF worker_id IS NULL THEN
-    RAISE exception 'INVALID_WORKER_ID';
+    RAISE EXCEPTION 'INVALID_WORKER_ID';
   END IF;
 
-  --
-
-  SELECT
-    jobs.queue_name,
-    jobs.id INTO v_queue_name,
-    v_job_id
-  FROM
-    app_jobs.jobs
-  WHERE (jobs.locked_at IS NULL
-    OR jobs.locked_at < (v_now - job_expiry))
+  SELECT jobs.queue_name, jobs.id
+    INTO v_queue_name, v_job_id
+  FROM app_jobs.jobs
+  WHERE is_available = true
+    AND (jobs.locked_at IS NULL
+      OR jobs.locked_at < (v_now - job_expiry))
     AND (jobs.queue_name IS NULL
-      OR EXISTS (
-        SELECT
-          1
-        FROM
-          app_jobs.job_queues
-        WHERE
-          job_queues.queue_name = jobs.queue_name
-          AND (job_queues.locked_at IS NULL
-            OR job_queues.locked_at < (v_now - job_expiry))
-        FOR UPDATE
-          SKIP LOCKED))
+      OR jobs.queue_name IN (
+        SELECT jq.queue_name
+        FROM app_jobs.job_queues jq
+        WHERE (jq.locked_at IS NULL
+            OR jq.locked_at < (v_now - job_expiry))
+        FOR UPDATE SKIP LOCKED
+      ))
     AND run_at <= v_now
     AND attempts < max_attempts
     AND (task_identifiers IS NULL
       OR task_identifier = ANY (task_identifiers))
-  ORDER BY
-    priority ASC,
-    run_at ASC,
-    id ASC
+  ORDER BY priority ASC, run_at ASC, id ASC
   LIMIT 1
-  FOR UPDATE
-    SKIP LOCKED;
-
-  --
+  FOR UPDATE SKIP LOCKED;
 
   IF v_job_id IS NULL THEN
     RETURN NULL;
   END IF;
 
-  --
-
   IF v_queue_name IS NOT NULL THEN
-    UPDATE
-      app_jobs.job_queues
-    SET
-      locked_by = worker_id,
-      locked_at = v_now
-    WHERE
-      job_queues.queue_name = v_queue_name;
+    UPDATE app_jobs.job_queues
+    SET locked_by = worker_id, locked_at = v_now
+    WHERE job_queues.queue_name = v_queue_name;
   END IF;
 
-  --
-
-  UPDATE
-    app_jobs.jobs
+  UPDATE app_jobs.jobs
   SET
     attempts = attempts + 1,
     locked_by = worker_id,
     locked_at = v_now
-  WHERE
-    id = v_job_id
-  RETURNING
-    * INTO v_row;
+  WHERE id = v_job_id
+  RETURNING * INTO v_row;
 
-  --
   RETURN v_row;
 END;
 $EOFCODE$;
@@ -646,15 +672,21 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.add_scheduled_job(db_id uuid, identifier text, payload pg_catalog.json DEFAULT '{}'::json, schedule_info pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_scheduled_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, schedule_info pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
 DECLARE
   v_job app_jobs.scheduled_jobs;
+  v_database_id uuid;
+  v_actor_id uuid;
 BEGIN
+  v_database_id := jwt_private.current_database_id();
+  v_actor_id := jwt_public.current_user_id();
+
   IF job_key IS NOT NULL THEN
 
-    -- Upsert job	
+    -- Upsert job
     INSERT INTO app_jobs.scheduled_jobs (
       database_id,
+      actor_id,
       task_identifier,
       payload,
       queue_name,
@@ -663,7 +695,8 @@ BEGIN
       key,
       priority
       ) VALUES (
-        db_id,
+        v_database_id,
+        v_actor_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -671,37 +704,38 @@ BEGIN
         coalesce(max_attempts, 25),
         job_key,
         coalesce(priority, 0)
-    )	
-    ON CONFLICT (key)	
-      DO UPDATE SET	
+    )
+    ON CONFLICT (key)
+      DO UPDATE SET
         task_identifier = EXCLUDED.task_identifier,
         payload = EXCLUDED.payload,
         queue_name = EXCLUDED.queue_name,
         max_attempts = EXCLUDED.max_attempts,
         schedule_info = EXCLUDED.schedule_info,
         priority = EXCLUDED.priority
-      WHERE	
-        scheduled_jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
-
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
-
-    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove	
+      WHERE
+        scheduled_jobs.locked_at IS NULL
+      RETURNING
+        * INTO v_job;
+
+    -- If upsert succeeded (insert or update), return early
+
+    IF NOT (v_job IS NULL) THEN
+      RETURN v_job;
+    END IF;
+
+    -- Upsert failed -> there must be an existing scheduled job that is locked. Remove
     -- and allow a new one to be inserted
 
-    DELETE FROM	
-      app_jobs.scheduled_jobs	
-    WHERE	
-      KEY = job_key;	
+    DELETE FROM
+      app_jobs.scheduled_jobs
+    WHERE
+      KEY = job_key;
   END IF;
 
   INSERT INTO app_jobs.scheduled_jobs (
     database_id,
+    actor_id,
     task_identifier,
     payload,
     queue_name,
@@ -709,7 +743,8 @@ BEGIN
     max_attempts,
     priority
     ) VALUES (
-    db_id,
+    v_database_id,
+    v_actor_id,
     identifier,
     payload,
     queue_name,
@@ -721,14 +756,21 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
-CREATE FUNCTION app_jobs.add_job(db_id uuid, identifier text, payload pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, run_at timestamptz DEFAULT now(), max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, run_at timestamptz DEFAULT now(), max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.jobs AS $EOFCODE$
 DECLARE
   v_job app_jobs.jobs;
+  v_database_id uuid;
+  v_actor_id uuid;
 BEGIN
+  -- Read context from JWT claims
+  v_database_id := jwt_private.current_database_id();
+  v_actor_id := jwt_public.current_user_id();
+
   IF job_key IS NOT NULL THEN
-    -- Upsert job	
+    -- Upsert job
     INSERT INTO app_jobs.jobs (
       database_id,
+      actor_id,
       task_identifier,
       payload,
       queue_name,
@@ -737,52 +779,51 @@ BEGIN
       key,
       priority
     ) VALUES (
-        db_id,
+        v_database_id,
+        v_actor_id,
         identifier,
-        coalesce(payload,
-        '{}'::json),
+        coalesce(payload, '{}'::json),
         queue_name,
         coalesce(run_at, now()),
         coalesce(max_attempts, 25),
         job_key,
         coalesce(priority, 0)
-    )	
-    ON CONFLICT (key)	
-      DO UPDATE SET	
+    )
+    ON CONFLICT (key)
+      DO UPDATE SET
         task_identifier = EXCLUDED.task_identifier,
         payload = EXCLUDED.payload,
         queue_name = EXCLUDED.queue_name,
         max_attempts = EXCLUDED.max_attempts,
         run_at = EXCLUDED.run_at,
-        priority = EXCLUDED.priority,	
-        -- always reset error/retry state	
-        attempts = 0, last_error = NULL	
-      WHERE	
-        jobs.locked_at IS NULL	
-      RETURNING	
-        * INTO v_job;	
-
-    -- If upsert succeeded (insert or update), return early	
-    
-    IF NOT (v_job IS NULL) THEN	
-      RETURN v_job;	
-    END IF;	
-
-    -- Upsert failed -> there must be an existing job that is locked. Remove	
-    -- existing key to allow a new one to be inserted, and prevent any	
-    -- subsequent retries by bumping attempts to the max allowed.
+        priority = EXCLUDED.priority,
+        -- always reset error/retry state
+        attempts = 0, last_error = NULL
+      WHERE
+        jobs.locked_at IS NULL
+      RETURNING
+        * INTO v_job;
+
+    -- If upsert succeeded (insert or update), return early
+    IF NOT (v_job IS NULL) THEN
+      RETURN v_job;
+    END IF;
 
-    UPDATE	
-      app_jobs.jobs	
-    SET	
-      KEY = NULL,	
-      attempts = jobs.max_attempts	
-    WHERE	
-      KEY = job_key;	
+    -- Upsert failed -> there must be an existing job that is locked. Remove
+    -- existing key to allow a new one to be inserted, and prevent any
+    -- subsequent retries by bumping attempts to the max allowed.
+    UPDATE
+      app_jobs.jobs
+    SET
+      key = NULL,
+      attempts = jobs.max_attempts
+    WHERE
+      key = job_key;
   END IF;
 
   INSERT INTO app_jobs.jobs (
     database_id,
+    actor_id,
     task_identifier,
     payload,
     queue_name,
@@ -790,7 +831,8 @@ BEGIN
     max_attempts,
     priority
   ) VALUES (
-    db_id,
+    v_database_id,
+    v_actor_id,
     identifier,
     payload,
     queue_name,
@@ -803,3 +845,38 @@ BEGIN
   RETURN v_job;
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+
+CREATE FUNCTION app_jobs.remove_job(job_key text) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
+DECLARE
+  v_job app_jobs.jobs;
+BEGIN
+  DELETE FROM app_jobs.jobs
+  WHERE key = job_key
+    AND (locked_at IS NULL
+      OR locked_at < NOW() - interval '4 hours')
+  RETURNING * INTO v_job;
+
+  IF NOT (v_job IS NULL) THEN
+    RETURN v_job;
+  END IF;
+
+  UPDATE app_jobs.jobs
+  SET
+    key = NULL,
+    attempts = jobs.max_attempts
+  WHERE key = job_key
+  RETURNING * INTO v_job;
+
+  RETURN v_job;
+END;
+$EOFCODE$;
+
+CREATE FUNCTION app_jobs.force_unlock_workers(worker_ids text[]) RETURNS void LANGUAGE sql VOLATILE AS $EOFCODE$
+  UPDATE app_jobs.jobs
+  SET locked_at = NULL, locked_by = NULL
+  WHERE locked_by = ANY (worker_ids);
+
+  UPDATE app_jobs.job_queues
+  SET locked_at = NULL, locked_by = NULL
+  WHERE locked_by = ANY (worker_ids);
+$EOFCODE$;

package/verify/schemas/app_jobs/procedures/force_unlock_workers.sql

@@ -0,0 +1,7 @@
+-- Verify schemas/app_jobs/procedures/force_unlock_workers  on pg
+
+BEGIN;
+
+SELECT verify_function ('app_jobs.force_unlock_workers');
+
+ROLLBACK;

package/verify/schemas/app_jobs/procedures/remove_job.sql

@@ -0,0 +1,7 @@
+-- Verify schemas/app_jobs/procedures/remove_job  on pg
+
+BEGIN;
+
+SELECT verify_function ('app_jobs.remove_job');
+
+ROLLBACK;

package/verify/schemas/app_jobs/tables/jobs/indexes/priority_run_at_id_idx.sql

@@ -2,6 +2,7 @@
 
 BEGIN;
 
-SELECT verify_index ('app_jobs.jobs', 'priority_run_at_id_idx');
+SELECT verify_index ('app_jobs.jobs', 'jobs_main_index');
+SELECT verify_index ('app_jobs.jobs', 'jobs_no_queue_index');
 
 ROLLBACK;

package/verify/schemas/app_jobs/tables/jobs/triggers/notify_worker.sql

@@ -1,6 +1,5 @@
 -- Verify schemas/app_jobs/tables/jobs/triggers/notify_worker  on pg
 BEGIN;
 SELECT
-    verify_trigger ('app_jobs._900_notify_worker');
+    verify_trigger ('app_jobs._900_after_insert');
 ROLLBACK;
-