Fix 'query: { pool: false }' in connection object.

Author: dxg

lib/ORM.js

@@ -71,12 +71,17 @@ exports.connect = function (opts, cb) {
 			return ORM_Error(new ORMError("CONNECTION_URL_EMPTY", 'PARAM_MISMATCH'), cb);
 		}
 		opts = url.parse(opts, true);
-		for(var k in opts.query) {
-			opts[k] = opts.query[k];
-		}
 	} else if (typeof opts == 'object') {
 		opts = _.cloneDeep(opts);
 	}
+
+	opts.query = opts.query || {};
+
+	for(var k in opts.query) {
+		opts.query[k] = queryParamCast(opts.query[k]);
+		opts[k] = opts.query[k];
+	}
+
 	if (!opts.database) {
 		// if (!opts.pathname) {
 		// 	return cb(new Error("CONNECTION_URL_NO_DATABASE"));
@@ -112,11 +117,9 @@ exports.connect = function (opts, cb) {
 	try {
 		var Driver   = adapters.get(proto);
 		var settings = new Settings.Container(exports.settings.get('*'));
-		var debug    = extractOption(opts, "debug");
-		var pool     = extractOption(opts, "pool");
 		var driver   = new Driver(opts, null, {
-			debug    : (debug !== null ? ((debug === "false" || debug === "0") ? false : true) : settings.get("connection.debug")),
-			pool     : (pool !== null ? ((pool === "false" || pool === "0") ? false : true) : settings.get("connection.pool")),
+			debug    : 'debug' in opts.query ? opts.query.debug : settings.get("connection.debug"),
+			pool     : 'pool'  in opts.query ? opts.query.pool  : settings.get("connection.pool"),
 			settings : settings
 		});
 
@@ -392,19 +395,16 @@ function ORM_Error(err, cb) {
 	return Emitter;
 }
 
-function extractOption(opts, key) {
-	if (!opts.query || !opts.query.hasOwnProperty(key)) {
-		return null;
-	}
-
-	var opt = opts.query[key];
-
-	delete opts.query[key];
-	if (opts.href) {
-		opts.href = opts.href.replace(new RegExp(key + "=[^&]+&?"), "");
-	}
-	if (opts.search) {
-		opts.search = opts.search.replace(new RegExp(key + "=[^&]+&?"), "");
+function queryParamCast (val) {
+	if (typeof val == 'string')	{
+		switch (val) {
+			case '1':
+			case 'true':
+				return true;
+			case '0':
+			case 'false':
+				return false;
+		}
 	}
-	return opt;
+	return val;
 }

test/integration/orm-exports.js

@@ -238,12 +238,75 @@ describe("ORM.connect()", function () {
 				return done();
 			});
 		});
+	});
 
-		it("should allow pool and debug settings to be false", function(done) {
+	describe("query options", function () {
+		it("should understand pool `'false'` from query string", function (done) {
 			var connString = common.getConnectionString() + "debug=false&pool=false";
-			ORM.connect(connString, function(err, db) {
-				db.driver.opts.pool.should.equal(false);
-				db.driver.opts.debug.should.equal(false);
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `'0'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=0&pool=0";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `'true'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=true&pool=true";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
+				done();
+			});
+		});
+
+		it("should understand pool `'1'` from query string", function (done) {
+			var connString = common.getConnectionString() + "debug=1&pool=1";
+			ORM.connect(connString, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
+				done();
+			});
+		});
+
+		it("should understand pool `false` from query options", function (done) {
+			var connOpts = _.extend(common.getConfig(), {
+				protocol: common.protocol(),
+				query: {
+				  pool: false, debug: false
+				}
+			});
+			ORM.connect(connOpts, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  false);
+				should.strictEqual(db.driver.opts.debug, false);
+				done();
+			});
+		});
+
+		it("should understand pool `true` from query options", function (done) {
+			var connOpts = _.extend(common.getConfig(), {
+				protocol: common.protocol(),
+				query: {
+				  pool: true, debug: true
+				}
+			});
+			ORM.connect(connOpts, function (err, db) {
+				should.not.exist(err);
+				should.strictEqual(db.driver.opts.pool,  true);
+				should.strictEqual(db.driver.opts.debug, true);
 				done();
 			});
 		});