Allow passing a single object to Model.create.

dxg · dxg · commit 63d8b7325804 · 2013-05-15T21:00:20.000+10:00
Addresses dresende#159
diff --git a/lib/Model.js b/lib/Model.js
@@ -398,10 +398,10 @@ function Model(opts) {
 	model.create = function () {
 		var Instances = [];
 		var options = {};
-		var cb = null, idx = 0;
+		var cb = null, idx = 0, single = false;
 		var createNext = function () {
 			if (idx >= Instances.length) {
-				return cb(null, Instances);
+				return cb(null, single ? Instances[0] : Instances);
 			}
 
 			Instances[idx] = createInstance(Instances[idx], {
@@ -423,14 +423,16 @@ function Model(opts) {
 		};
 
 		for (var i = 0; i < arguments.length; i++) {
-			if (Array.isArray(arguments[i])) {
-				Instances = Instances.concat(arguments[i]);
-				continue;
-			}
-
 			switch (typeof arguments[i]) {
 				case "object":
-					options = arguments[i];
+					if ( !single && Array.isArray(arguments[i]) ) {
+						Instances = Instances.concat(arguments[i]);
+					} else if (i == 0) {
+						single = true;
+						Instances.push(arguments[i]);
+					} else {
+						options = arguments[i];
+					}
 					break;
 				case "function":
 					cb = arguments[i];
diff --git a/package.json b/package.json
@@ -43,7 +43,8 @@
     "urun"      : "0.0.6",
     "mysql"     : "2.0.0-alpha7",
     "pg"        : "1.0.0",
-    "sqlite3"   : "2.1.5"
+    "sqlite3"   : "2.1.5",
+    "async"     : "*"
   },
   "optionalDependencies": {}
 }
diff --git a/test/integration/test-create.js b/test/integration/test-create.js
@@ -1,20 +1,58 @@
 var common     = require('../common');
 var assert     = require('assert');
+var async      = require('async');
 
 common.createConnection(function (err, db) {
 	common.createModelTable('test_create', db.driver.db, function () {
 		var TestModel = db.define('test_create', common.getModelProperties());
 
-		TestModel.create([
-			{ name: 'test1' },
-			{ name: 'test2' },
-			{ name: 'test3' }
-		], function (err) {
-			TestModel.count(function (err, count) {
-				assert.equal(err, null);
-				assert.equal(count, 3);
-				db.close();
-			});
+		async.series([
+			// Test that items are actually created
+			function (done) {
+				TestModel.create([
+					{ name: 'test1' },
+					{ name: 'test2' },
+					{ name: 'test3' }
+				], function (err) {
+					TestModel.count(function (err, count) {
+						assert.equal(err, null);
+						assert.equal(count, 3);
+						done();
+					});
+				});
+			},
+			function (done) {
+				TestModel.create({ name: 'test4' }, function (err) {
+					TestModel.count(function (err, count) {
+						assert.equal(err, null);
+						assert.equal(count, 4);
+						done();
+					});
+				});
+			},
+			// Test callback arguments
+			function (done) {
+				TestModel.create([
+					{ name: 'test5' },
+					{ name: 'test6' }
+				], function (err, items) {
+					assert.equal(err, null);
+					assert.equal(Array.isArray(items), true);
+					assert.equal(items.length, 2);
+					done();
+				});
+			},
+			function (done) {
+				TestModel.create({ name: 'test7' }, function (err, item) {
+					assert.equal(err, null);
+					assert.equal(Array.isArray(item), false);
+					assert.equal(item.name, 'test7');
+					assert.equal(item.hasOwnProperty('id'), true);
+					done();
+				});
+			}
+		], function complete() {
+			db.close();
 		});
 	});
 });
