dbqueue - npm Package Compare versions

Comparing version 3.0.2 to 3.0.3

main.js

@@ -24,3 +24,3 @@ 'use strict';
 
-  queue.db.query("SELECT NOW()", function(err, result) {
+  queue.query("SELECT NOW()", [], function(err, result) {
     if (err) {
@@ -34,5 +34,22 @@ return done(err);
 
+DBQueue.prototype.query = function(sql, bindings, done) {
+  return this.db.getConnection(function(err, connection) {
+    if (err) {
+      return done(err);
+    }
+
+    connection.query(sql, bindings, function(err, results) {
+      connection.release();
+
+      if (err) {
+        return done(err);
+      }
+
+      return done(err, results);
+    });
+  });
+};
+
 DBQueue.prototype.insert = function(queue_name, data, done) {
   var self  = this;
-  var db    = this.db;
   var table = this.table;
@@ -50,3 +67,3 @@
     ;
-  db.query(sql, [table, queue_name, to_store], function(err, rows, fields) {
+  this.query(sql, [table, queue_name, to_store], function(err, rows, fields) {
     if (err) {
@@ -61,3 +78,3 @@ return done(err);
 function reserveJobs(queue, queue_input, options, done) {
-  var db        = queue.db;
+  var self      = queue;
   var table     = queue.table;
@@ -69,3 +86,3 @@ var worker_id = uuid.v4();
 
-  db.query("SELECT NOW() AS now, NOW() + INTERVAL ? SECOND AS lock_until", [lock_time], function(err, result) {
+  self.query("SELECT NOW() AS now, NOW() + INTERVAL ? SECOND AS lock_until", [lock_time], function(err, result) {
     if (err) {
@@ -89,3 +106,3 @@ return done(err);
 
-    db.query(reserve_jobs_sql, [table, worker_id, lock_until, now, now, queue_input, limit], function(err, result) {
+    self.query(reserve_jobs_sql, [table, worker_id, lock_until, now, now, queue_input, limit], function(err, result) {
       if (err) {
@@ -106,3 +123,3 @@ return done(err);
 
-      return db.query(find_reserved_jobs_sql, [table, worker_id, lock_until], done);
+      return self.query(find_reserved_jobs_sql, [table, worker_id, lock_until], done);
     });
@@ -113,3 +130,2 @@ });
 DBQueue.prototype.consume = function(queue_input, options_input, done_input) {
-  var db    = this.db;
   var table = this.table;
@@ -139,3 +155,3 @@ var self  = this;
 
-    rows.map(function(job) {
+    rows.forEach(function(job) {
       function finishedWithJob(err) {
@@ -146,3 +162,3 @@ if (err) {
 
-        db.query("DELETE FROM ?? WHERE id = ?", [table, job.id], function(err, result) {
+        self.query("DELETE FROM ?? WHERE id = ?", [table, job.id], function(err, result) {
           if (err) {
@@ -207,3 +223,2 @@ console.error('Error acking message:', err, err.stack);
 DBQueue.prototype.size = function(queue_input, done) {
-  var db    = this.db;
   var table = this.table;
@@ -216,3 +231,3 @@
     ;
-  db.query(total_jobs_sql, [table, queue_input], function(err, rows) {
+  this.query(total_jobs_sql, [table, queue_input], function(err, rows) {
     if (err) {
@@ -219,0 +234,0 @@ return done(err);

package.json

 {
   "name": "dbqueue",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "A minimal, durable DB-based message queue system",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/elliotf/node-dbqueue",

test/main.js

@@ -31,2 +31,34 @@ 'use strict';
     });
+
+    context('when the database port is invalid', function() {
+      it('yields an error rather than throw an exception', function(done) {
+        var config = _.extend({}, helper.test_db_config, {
+          port: 10,
+        });
+
+        DBQueue.connect(config, function(err, queue) {
+          expect(err).to.exist();
+
+          expect(err.code).to.equal('ECONNREFUSED');
+
+          return done();
+        });
+      });
+    });
+
+    context('when the database hostname is invalid', function() {
+      it('yields an error rather than throw an exception', function(done) {
+        var config = _.extend({}, helper.test_db_config, {
+          host: 'fake-domain-here.example',
+        });
+
+        DBQueue.connect(config, function(err, queue) {
+          expect(err).to.exist();
+
+          expect(err.code).to.equal('ENOTFOUND');
+
+          return done();
+        });
+      });
+    });
   });
@@ -90,2 +122,18 @@
     });
+
+    context('when the database port is invalid', function() {
+      it('yields an error rather than throw an exception', function(done) {
+        var config = _.extend({}, helper.test_db_config, {
+          port: 10,
+        });
+
+        queue = new DBQueue(config);
+
+        queue.insert('queue name', 'fake message', function(err) {
+          expect(err).to.exist();
+
+          return done();
+        });
+      });
+    });
   });
@@ -92,0 +140,0 @@

No alert changes

Improved metrics

Total package byte prevSize

43752

increased by3.83%

Lines of code

972

increased by5.08%

No dependency changes