neosqlite 1.0.13 → 1.0.15

package/lib/package.json

@@ -1,7 +1,7 @@
 {
     "name": "neosqlite",
     "description": "A lightweight wrapper around better-sqlite3 that adds developer-friendly features like job scheduling, migrations, error handling, query logging, SQL utilities, and more",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "main": "lib/src/index.js",
     "scripts": {
         "build": "tsc",

package/lib/src/client/util.d.ts

@@ -16,7 +16,7 @@ export declare const runQuery: (config: NeosqliteConfig, params: ExecuteQueryPar
  * // Returns
  * "SELECT * FROM users WHERE id = :id"
  */
-export declare const queryString: (...args: (string | boolean | undefined)[]) => string;
+export declare const queryString: (...args: (string | boolean | undefined | null)[]) => string;
 /**
  * Take a list and return an object with its sql placeholder names, and
  * its prepared arguments

package/lib/src/jobs/index.js

@@ -96,7 +96,7 @@ class NeosqliteJobs {
         const interval = cron_parser_1.default.parse(cronString);
         const runAt = interval.next().toDate();
         this.db.write({
-            sql: (0, util_1.queryString)("INSERT OR IGNORE INTO " + this.jobsTable, "(name, data, runAt, priority, cron)", "VALUES (:name, :data, :runAt, :priority, :cron)"),
+            sql: (0, util_1.queryString)("INSERT INTO " + this.jobsTable + " (name, data, runAt, priority, cron)", "VALUES (:name, :data, :runAt, :priority, :cron)", "ON CONFLICT DO UPDATE SET cron = :cron, data = :data, priority = :priority, runAt = :runAt"),
             args: {
                 name: job.name,
                 priority: job.options.priority ?? 0,
@@ -116,6 +116,9 @@ class NeosqliteJobs {
         this.db.write((0, util_1.queryString)("CREATE TABLE IF NOT EXISTS " + this.jobsTable + " (", "  id INTEGER PRIMARY KEY AUTOINCREMENT,", "  name TEXT NOT NULL,", "  data TEXT,", "  runAt DATETIME NOT NULL,", "  priority INTEGER DEFAULT 0,", "  cron TEXT,", "  attempts INTEGER DEFAULT 0,", "  status TEXT CHECK (status IN ( " + jobStatuses + ")) DEFAULT '" + types_1.JobStatus.Pending + "',", "  updatedAt DATETIME DEFAULT CURRENT_TIMESTAMP,", "  createdAt DATETIME DEFAULT CURRENT_TIMESTAMP", ")"));
         // Prevent multiple cron jobs from getting scheduled for the same dates
         this.db.write(`CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_runAt ON ${this.jobsTable} (name, cron, runAt)`);
+        // Only allow cron jobs to have one scheduled run at a time, so that updating a crons syntax is easier, and immediately updates
+        this.db.write(`CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_status ON ${this.jobsTable} (name, cron, status) WHERE cron IS NOT NULL AND status IN ('${types_1.JobStatus.Pending}');`);
+        // Allow faster querying of pending jobs
         this.db.write(`CREATE INDEX IF NOT EXISTS idx_${this.jobsTable}_status_runAt_priority ON ${this.jobsTable} (status, runAt, priority DESC)`);
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "neosqlite",
   "description": "A lightweight wrapper around better-sqlite3 that adds developer-friendly features like job scheduling, migrations, error handling, query logging, SQL utilities, and more",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "main": "lib/src/index.js",
   "scripts": {
     "build": "tsc",

package/src/client/util.ts

@@ -50,7 +50,7 @@ export const runQuery = (config: NeosqliteConfig, params: ExecuteQueryParams, fn
  * // Returns
  * "SELECT * FROM users WHERE id = :id"
  */
-export const queryString = (...args: (string | boolean | undefined)[]) => {
+export const queryString = (...args: (string | boolean | undefined | null)[]) => {
   const filteredArgs = args.filter(Boolean);
   return filteredArgs.join(NEWLINE_CHAR);
 };

package/src/jobs/index.ts

@@ -126,9 +126,9 @@ export class NeosqliteJobs {
 
     this.db.write({
       sql: queryString(
-        "INSERT OR IGNORE INTO " + this.jobsTable,
-        "(name, data, runAt, priority, cron)",
+        "INSERT INTO " + this.jobsTable + " (name, data, runAt, priority, cron)",
         "VALUES (:name, :data, :runAt, :priority, :cron)",
+        "ON CONFLICT DO UPDATE SET cron = :cron, data = :data, priority = :priority, runAt = :runAt",
       ),
       args: {
         name: job.name,
@@ -169,6 +169,13 @@ export class NeosqliteJobs {
     this.db.write(
       `CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_runAt ON ${this.jobsTable} (name, cron, runAt)`,
     );
+
+    // Only allow cron jobs to have one scheduled run at a time, so that updating a crons syntax is easier, and immediately updates
+    this.db.write(
+      `CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_status ON ${this.jobsTable} (name, cron, status) WHERE cron IS NOT NULL AND status IN ('${JobStatus.Pending}');`,
+    );
+
+    // Allow faster querying of pending jobs
     this.db.write(
       `CREATE INDEX IF NOT EXISTS idx_${this.jobsTable}_status_runAt_priority ON ${this.jobsTable} (status, runAt, priority DESC)`,
     );