knex.js byodb support (#157)

* removed explicit param parsing for knex support * 4.0.1 release
timgit · Mar 20, 2020 · d6014c7 · d6014c7
1 parent 5a9b2d7
commit d6014c7
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes
 
+## 4.0.1
+
+- Restored BYODB support for Knex.js
+
 ## 4.0.0 :tada:
 
 ### Changes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-boss",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Queueing jobs in Node.js using PostgreSQL like a boss",
   "main": "./src/index.js",
   "engines": {

diff --git a/src/plans.js b/src/plans.js
@@ -321,26 +321,6 @@ function cancelJobs (schema) {
 
 function insertJob (schema) {
   return `
-    WITH j AS (SELECT
-      $1::uuid as id,
-      $2::text as name,
-      $3::int as priority,
-      '${states.created}'::${schema}.job_state as state,
-      $4::int as retryLimit,
-      CASE
-        WHEN right($5, 1) = 'Z' THEN CAST($5 as timestamp with time zone)
-        ELSE now() + CAST(COALESCE($5,'0') as interval)
-        END as startAfter,
-      CAST($6 as interval) as expireIn,
-      $7::jsonb as data,
-      $8::text as singletonKey,
-      CASE
-        WHEN $9::integer IS NOT NULL THEN 'epoch'::timestamp + '1 second'::interval * ($9 * floor((date_part('epoch', now()) + $10) / $9))
-        ELSE NULL
-        END as singletonOn,
-      $11::int as retryDelay,
-      $12::bool as retryBackoff
-    )
     INSERT INTO ${schema}.job (
       id,
       name,
@@ -355,7 +335,7 @@ function insertJob (schema) {
       retryDelay,
       retryBackoff,
       keepUntil
-      )
+    )
     SELECT
       id,
       name,
@@ -369,11 +349,40 @@ function insertJob (schema) {
       singletonOn,
       retryDelay,
       retryBackoff,
-      CASE
-        WHEN right($13, 1) = 'Z' THEN CAST($13 as timestamp with time zone)
-        ELSE startAfter + CAST(COALESCE($13,'0') as interval)
-        END as keepUntil
-    FROM j
+      keepUntil
+    FROM
+    ( SELECT *,
+        CASE
+          WHEN right(keepUntilValue, 1) = 'Z' THEN CAST(keepUntilValue as timestamp with time zone)
+          ELSE startAfter + CAST(COALESCE(keepUntilValue,'0') as interval)
+          END as keepUntil
+      FROM
+      ( SELECT *,
+          CASE
+            WHEN right(startAfterValue, 1) = 'Z' THEN CAST(startAfterValue as timestamp with time zone)
+            ELSE now() + CAST(COALESCE(startAfterValue,'0') as interval)
+            END as startAfter
+        FROM
+        ( SELECT
+            $1::uuid as id,
+            $2::text as name,
+            $3::int as priority,
+            '${states.created}'::${schema}.job_state as state,
+            $4::int as retryLimit,
+            $5::text as startAfterValue,
+            CAST($6 as interval) as expireIn,
+            $7::jsonb as data,
+            $8::text as singletonKey,
+            CASE
+              WHEN $9::integer IS NOT NULL THEN 'epoch'::timestamp + '1 second'::interval * ($9 * floor((date_part('epoch', now()) + $10) / $9))
+              ELSE NULL
+              END as singletonOn,
+            $11::int as retryDelay,
+            $12::bool as retryBackoff,
+            $13::text as keepUntilValue
+        ) j1
+      ) j2
+    ) j3
     ON CONFLICT DO NOTHING
     RETURNING id
   `