@iterativeflow/mysql 2.0.1 → 2.1.1

package/dist/index.mjs

@@ -17,7 +17,7 @@ const createMysqlQueue = (sql, t, id) => {
 			const at = ms(now);
 			const expiresAt = new Date(at + leaseMs);
 			return sql.tx(async (tx) => {
-				const namePredicate = names ? ` AND r.name IN (${names.map(() => "?").join(",")})` : "";
+				const namePredicate = names ? ` AND (r.name IS NULL OR r.name IN (${names.map(() => "?").join(",")}))` : "";
 				const params = names ? [
 					at,
 					at,
@@ -191,7 +191,19 @@ const ddl = (prefix = "") => {
       next_run_at  BIGINT NOT NULL,
       last_run_at  BIGINT,
       KEY cron_due (next_run_at)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`,
+		`DROP FUNCTION IF EXISTS \`${prefix}pending_work\``,
+		`CREATE FUNCTION \`${prefix}pending_work\`(flow_names JSON, as_of BIGINT)
+     RETURNS BIGINT READS SQL DATA
+     RETURN (
+       (SELECT COUNT(*) FROM ${t.job} j LEFT JOIN ${t.run} r ON r.id = j.run_id
+          WHERE j.run_at <= as_of AND (j.lease_expires IS NULL OR j.lease_expires <= as_of)
+            AND (flow_names IS NULL OR JSON_CONTAINS(flow_names, JSON_QUOTE(r.name))))
+     + (SELECT COUNT(*) FROM ${t.timer} tm LEFT JOIN ${t.run} r ON r.id = tm.run_id
+          WHERE tm.fire_at <= as_of AND (flow_names IS NULL OR JSON_CONTAINS(flow_names, JSON_QUOTE(r.name))))
+     + (SELECT COUNT(*) FROM ${t.cron} c
+          WHERE c.next_run_at <= as_of AND (flow_names IS NULL OR JSON_CONTAINS(flow_names, JSON_QUOTE(c.flow_name))))
+     )`
 	];
 };
 /** Apply the schema DDL (idempotent). Run once before use. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iterativeflow/mysql",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@iterativeflow/core": "2.0.1"
+    "@iterativeflow/core": "2.1.1"
   },
   "peerDependencies": {
     "mysql2": ">=3.0.0"