@pgpm/database-jobs 0.20.2 → 0.21.2

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.20.2",
+  "version": "0.21.2",
   "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.16.6"
   },
   "dependencies": {
-    "@pgpm/verify": "0.20.0"
+    "@pgpm/jwt-claims": "0.21.2",
+    "@pgpm/verify": "0.21.2"
   },
   "repository": {
     "type": "git",
@@ -34,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "109293dbfe8c205a9265ab36c8cb99efa5dcc1fb"
+  "gitHead": "c7d836c99c7ce519e9bb79e6343bee3741781766"
 }

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/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;
-