Changes Model.one() to return only one instance (or null) instead of an Array (dresende#148)

dresende · dresende · commit ba74d8506a56 · 2013-05-06T10:37:56.000+01:00
diff --git a/lib/Model.js b/lib/Model.js
@@ -297,7 +297,28 @@ function Model(opts) {
 
 	model.one = function () {
 		var args = Array.prototype.slice.apply(arguments);
+		var cb   = null;
+
+		// extract callback
+		for (var i = 0; i < args.length; i++) {
+			if (typeof args[i] == "function") {
+				cb = args.splice(i, 1)[0];
+				break;
+			}
+		}
+
+		if (cb === null) {
+			throw new Error("Model.one() called without callback");
+		}
+
+		// add limit 1
 		args.push(1);
+		args.push(function (err, results) {
+			if (err) {
+				return cb(err);
+			}
+			return cb(null, results.length ? results[0] : null);
+		});
 
 		return this.find.apply(this, args);
 	};
diff --git a/test/integration/test-one-conditions.js b/test/integration/test-one-conditions.js
@@ -13,10 +13,9 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one_conditions', common.getModelProperties());
 
-			TestModel.one({ name: 'test1' }, function (err, Instances) {
+			TestModel.one({ name: 'test2' }, function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
+				assert.equal(Instance, null);
 				db.close();
 			});
 		});
diff --git a/test/integration/test-one-order.js b/test/integration/test-one-order.js
@@ -13,11 +13,10 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one_order', common.getModelProperties());
 
-			TestModel.one("-name", function (err, Instances) {
+			TestModel.one("-name", function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
-				assert.equal(Instances[0].id, 4);
+				assert.equal(!Array.isArray(Instance), true);
+				assert.equal(Instance.id, 4);
 				db.close();
 			});
 		});
diff --git a/test/integration/test-one.js b/test/integration/test-one.js
@@ -11,10 +11,10 @@ common.createConnection(function (err, db) {
 
 			var TestModel = db.define('test_one', common.getModelProperties());
 
-			TestModel.one(function (err, Instances) {
+			TestModel.one(function (err, Instance) {
 				assert.equal(err, null);
-				assert.equal(Array.isArray(Instances), true);
-				assert.equal(Instances.length, 1);
+				assert.equal(!Array.isArray(Instance), true);
+				assert.equal(typeof Instance.id, "number");
 				db.close();
 			});
 		});
