Merge pull request #15 from strongloop/feature/fix-arc-600

Map required/id properties to NOT NULL

Author: raymondfeng

lib/mssql.js

@@ -1183,10 +1183,15 @@ MsSQL.prototype.indexSettingsSQL = function (model, prop) {
   return cmd;
 };
 
+function isNullable(p) {
+  return !(p.required || p.id || p.nullable === false ||
+    p.allowNull === false || p['null'] === false);
+}
+
 MsSQL.prototype.propertySettingsSQL = function (model, prop) {
   var p = this._models[model].properties[prop];
   return this.columnDataType(model, prop) + ' ' +
-    (p.allowNull === false || p['null'] === false ? 'NOT NULL' : 'NULL');
+    (isNullable(p) ? 'NULL' : 'NOT NULL');
 };
 
 MsSQL.prototype.automigrate = function(models, cb) {

test/autoupdate.test.js

@@ -32,7 +32,7 @@ describe('MS SQL server connector', function () {
         },
         "email": {
           "type": "String",
-          "required": false,
+          "required": true,
           "length": 40
         },
         "age": {
@@ -66,7 +66,7 @@ describe('MS SQL server connector', function () {
             "columnName": "EMAIL",
             "dataType": "nvarchar",
             "dataLength": 60,
-            "nullable": "Y"
+            "nullable": "YES"
           }
         },
         "firstName": {
@@ -92,6 +92,11 @@ describe('MS SQL server connector', function () {
         var names = props.map(function (p) {
           return p.columnName;
         });
+        assert.equal(props[0].nullable, 'NO');
+        assert.equal(props[1].nullable, 'YES');
+        assert.equal(props[2].nullable, 'NO');
+        assert.equal(props[3].nullable, 'YES');
+
         assert.equal(names[0], 'id');
         assert.equal(names[1], 'name');
         assert.equal(names[2], 'email');