Fixes property defaultValue not being set if property is null (closes #…

…104)

Added a test for this and fixed another one.

lib/Instance.js

@@ -67,6 +67,13 @@ function Instance(opts) {
 			return saveInstanceExtra(cb);
 		}
 
+		for (var k in opts.properties) {
+			if (!opts.properties.hasOwnProperty(k)) continue;
+			if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
+				opts.data[k] = opts.properties[k].defaultValue;
+			}
+		}
+
 		if (opts.is_new || !opts.data.hasOwnProperty(opts.id)) {
 			Hook.trigger(instance, opts.hooks.beforeCreate);
 		}

test/common.js

@@ -64,7 +64,7 @@ common.getConnectionString = function () {
 
 common.getModelProperties = function () {
 	return {
-		name: String
+		name: { type: "text", defaultValue: "test_default_value" }
 	};
 };
 

test/integration/test-create-defaultvalue.js

@@ -0,0 +1,20 @@
+var common     = require('../common');
+var assert     = require('assert');
+
+common.createConnection(function (err, db) {
+	common.createModelTable('test_create_defaultvalue', db.driver.db, function () {
+		var TestModel = db.define('test_create_defaultvalue', common.getModelProperties());
+
+		TestModel.create([
+			{ name: null }
+		], function (err) {
+			TestModel.find(function (err, items) {
+				assert.equal(err, null);
+				assert.equal(Array.isArray(items), true);
+				assert.equal(items.length, 1);
+				assert.equal(items[0].name, "test_default_value");
+				db.close();
+			});
+		});
+	});
+});

test/integration/test-hook-before-create-define-property.js

@@ -7,9 +7,7 @@ common.createConnection(function (err, db) {
 		var TestModel = db.define('test_hook_before_create_define_property', common.getModelProperties(), {
 			hooks: {
 				beforeCreate: function () {
-					if (!this.name) {
-						this.name = name;
-					}
+					this.name = name;
 				}
 			}
 		});