Merge pull request #7 from wirehead/pg-3-to-pg-6

Updating to pg v6.0.1
kusor · Aug 1, 2016 · 3710f32 · 3710f32
2 parents 49efe9d + df16c0a
commit 3710f32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/workflow-pg-backend.js b/lib/workflow-pg-backend.js
@@ -305,9 +305,13 @@ var WorkflowPgBackend = module.exports = function (config) {
                     Object.keys(row).forEach(function (p) {
                         if (p === 'chain' || p === 'onerror' ||
                             p === 'oncancel') {
-                            workflow[p] = JSON.parse(row[p]);
+                            if (row[p] !== null) {
+                                workflow[p] = JSON.parse(row[p]);
+                            }
                         } else {
-                            workflow[p] = row[p];
+                            if (row[p] !== null) {
+                                workflow[p] = row[p];
+                            }
                         }
                     });
                     return callback(null, workflow);

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "node": ">=0.8"
   },
   "dependencies": {
-    "pg": "3.3.0",
+    "pg": "6.0.1",
     "bunyan": "0.23.1",
     "vasync": "1.3.3",
     "node-uuid": "1.4.0",