Merge pull request #405 from picatic/master

Pool and debug settings always are true
dresende · Dec 12, 2013 · 4dca6d3 · 4dca6d3
2 parents 202a723 + ee9b064
commit 4dca6d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/ORM.js b/lib/ORM.js
@@ -112,8 +112,8 @@ exports.connect = function (opts, cb) {
 		var debug    = extractOption(opts, "debug");
 		var pool     = extractOption(opts, "pool");
 		var driver   = new Driver(opts, null, {
-			debug    : (debug !== null ? Boolean(debug) : settings.get("connection.debug")),
-			pool     : (pool !== null ? Boolean(pool) : settings.get("connection.pool")),
+			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")),
 			settings : settings
 		});
 

diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
@@ -190,6 +190,15 @@ describe("ORM.connect()", function () {
 				return done();
 			});
 		});
+
+		it("should allow pool and debug settings to be false", 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);
+				done();
+			});
+		});
 	});
 });