Added additional tests for the QueryBuilder adapter.

Author: Kyle Farris

drivers/mysql/adapters.js

@@ -136,6 +136,7 @@ var Adapters = function(nqb) {
 			},
 
 			release: function() {
+				if (!pool) throw new Error("You cannot release a non-pooled connection from a connection pool!");
 				pool.releaseConnection(connection);
 			}
 		}, qb, qe);

test/mysql/tests-adapter.js

@@ -12,7 +12,14 @@ var check = function(done, f) {
 	}
 };
 
-describe('QueryBuilder() - MySQL', function() {
+var connection_released = function(qb) {
+	var connection = qb.connection();
+	expect(connection._pool._freeConnections).to.have.length(0);
+	qb.release();
+	expect(connection._pool._freeConnections).to.have.length(1);
+};
+
+describe('QueryBuilder() - MySQL Adapter', function() {
 	var on_connect = function(err) {
 		if (err) { console.error("Not connected!"); return; }
 		console.log("connected!");
@@ -38,6 +45,21 @@ describe('QueryBuilder() - MySQL', function() {
 	it('should be a function', function() {
 		nqb.QueryBuilder.should.be.a('function');
 	});
+	it('should have all the QueryBuilder methods', function() {
+		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
+		var children = ['where_array','where_in_array','from_array','join_array','select_array','set_array','order_by_array','group_by_array','having_array','limit_to','offset_val','join_clause','last_query_string','distinct_clause','aliased_tables','reset_query','where','or_where','_where','where_in','or_where_in','where_not_in','or_where_not_in','_where_in','like','not_like','or_like','or_not_like','_like','from','join','select','select_min','select_max','select_avg','select_sum','_min_max_avg_sum','distinct','group_by','having','or_having','_having','order_by','limit','offset','set'];
+		expect(qb).to.include.keys(children);
+	});
+	it('should have all the QueryExec methods', function() {
+		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
+		var children = ['insert','insert_ignore','insert_batch','get','get_where','count','update','update_batch','delete','get_compiled_select','get_compiled_delete','get_compiled_update','get_compiled_insert','compile_select','compile_delete','compile_update','compile_insert'];
+		expect(qb).to.include.keys(children);
+	});
+	it('should have all the miscellaneous methods', function() {
+		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
+		var children = ['last_query','escape','empty_table','truncate'];
+		expect(qb).to.include.keys(children);
+	});
 	it('should establish a single connection given valid connection credentials', function(done) {
 		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
 		expect(qb, 'should have connect property').to.have.property('connect');
@@ -196,4 +218,63 @@ describe('QueryBuilder() - MySQL', function() {
 			});
 		});
 	});
+	it('should allow us to execute a query', function(done) {
+		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
+		qb.connect(function(err) {
+			qb.query("select * from `cities` where `city` like 'Z%' and `state_code` = 'FL'", function(err, res) {
+				check(done, function() {
+					expect(err).to.not.be.instanceof(Error);
+					expect(res).to.not.be.empty;
+					expect(res).to.have.length(3);
+				});
+			});
+		});
+	});
+	it('should not be able to release a non-pooled connection', function(done) {
+		var qb = nqb.QueryBuilder(_.extend({}, settings), driver);
+		qb.connect(function(err) {
+			check(done, function() {
+				expect(function() { qb.release(); }).to.throw(Error);
+			});
+		});
+	});
+	it('should create a connection pool object if asked', function() {
+		var pool = nqb.QueryBuilder(_.extend({}, settings), driver, 'pool');
+		expect(pool).to.be.instanceof.object;
+		expect(pool).to.include.keys(['pool','get_connection','disconnect']);
+		pool.pool.should.be.a('function');
+		pool.get_connection.should.be.a('function');
+		pool.disconnect.should.be.a('function');
+	});
+	it('should create a QueryBuilder adapter when getting a connection from the pool', function(done) {
+		var qb2 = nqb.QueryBuilder(_.extend({}, settings), driver);
+		var pool = nqb.QueryBuilder(_.extend({}, settings), driver, 'pool');
+		pool.get_connection(function(qb) {
+			check(done, function() {
+				expect(qb).to.include.keys(Object.keys(qb2));
+			});
+		});
+	});
+	it('should allow one to release a connection from the pool', function(done) {
+		var qb2 = nqb.QueryBuilder(_.extend({}, settings), driver);
+		var pool = nqb.QueryBuilder(_.extend({}, settings), driver, 'pool');
+		pool.get_connection(function(qb) {
+			check(done, function() { connection_released(qb); });
+		});
+	});
+	it('should allow one use the same connection pool connection for multiple queries', function(done) {
+		var pool = nqb.QueryBuilder(_.extend({}, settings), driver, 'pool');
+
+		pool.get_connection(function(qb) {
+			qb.query('select * from `cities` where `city` = "Gainesville"', function(err, res) {
+				if (res.length > 0) {
+					qb.query('select * from `cities` where `state_code` = "' + res[0].state_code + '"', function(err, res) {
+						check(done, function() { connection_released(qb); });
+					});
+				} else {
+					check(done, function() { connection_released(qb); });
+				}
+			});
+		});
+	});
 });