Fixed the different column name in datasource (#255)

* Fixed the different column name in datasource

Issue #250

* Added test to change the nullable property

* moved the code from the function into test block

lib/migration.js

@@ -307,7 +307,8 @@ function mixinMigration(MySQL, mysql) {
     function actualize(propName, oldSettings) {
       var newSettings = m.properties[propName];
       if (newSettings && changed(newSettings, oldSettings)) {
-        var pName = self.client.escapeId(propName);
+        // Check if the property has a different column name in the database (other than property name)
+        var pName = (newSettings.mysql && newSettings.mysql.columnName) || self.client.escapeId(propName);
         sql.push('CHANGE COLUMN ' + pName + ' ' + pName + ' ' +
           self.buildColumnDefinition(model, propName));
       }

test/mysql.autoupdate.test.js

@@ -18,99 +18,97 @@ describe('MySQL connector', function() {
   });
 
   it('should auto migrate/update tables', function(done) {
-    var schema_v1 =
+    var schema_v1 = {
-      {
+      'name': 'CustomerTest',
-        'name': 'CustomerTest',
+      'options': {
-        'options': {
+        'idInjection': false,
-          'idInjection': false,
+        'mysql': {
-          'mysql': {
+          'schema': 'myapp_test',
-            'schema': 'myapp_test',
+          'table': 'customer_test',
-            'table': 'customer_test',
+        },
-          },
+        'indexes': {
-          'indexes': {
+          'name_index': {
-            'name_index': {
+            'keys': {
-              'keys': {
+              'name': 1,
-                'name': 1,
+            },
-              },
+            'options': {
-              'options': {
+              'unique': true,
-                'unique': true,
-              },
             },
           },
         },
-        'properties': {
+      },
-          'id': {
+      'properties': {
-            'type': 'String',
+        'id': {
-            'length': 20,
+          'type': 'String',
-            'id': 1,
+          'length': 20,
-          },
+          'id': 1,
-          'name': {
-            'type': 'String',
-            'required': false,
-            'length': 40,
-          },
-          'email': {
-            'type': 'String',
-            'required': true,
-            'length': 40,
-          },
-          'age': {
-            'type': 'Number',
-            'required': false,
-          },
         },
-      };
+        'name': {
+          'type': 'String',
+          'required': false,
+          'length': 40,
+        },
+        'email': {
+          'type': 'String',
+          'required': true,
+          'length': 40,
+        },
+        'age': {
+          'type': 'Number',
+          'required': false,
+        },
+      },
+    };
 
-    var schema_v2 =
+    var schema_v2 = {
-      {
+      'name': 'CustomerTest',
-        'name': 'CustomerTest',
+      'options': {
-        'options': {
+        'idInjection': false,
-          'idInjection': false,
+        'mysql': {
+          'schema': 'myapp_test',
+          'table': 'customer_test',
+        },
+        'indexes': {
+          'updated_name_index': {
+            'keys': {
+              'firstName': 1,
+              'lastName': -1,
+            },
+            'options': {
+              'unique': true,
+            },
+          },
+        },
+      },
+      'properties': {
+        'id': {
+          'type': 'String',
+          'length': 20,
+          'id': 1,
+        },
+        'email': {
+          'type': 'String',
+          'required': false,
+          'length': 60,
           'mysql': {
-            'schema': 'myapp_test',
+            'columnName': 'email',
-            'table': 'customer_test',
+            'dataType': 'varchar',
-          },
+            'dataLength': 60,
-          'indexes': {
+            'nullable': 'YES',
-            'updated_name_index': {
-              'keys': {
-                'firstName': 1,
-                'lastName': -1,
-              },
-              'options': {
-                'unique': true,
-              },
-            },
           },
         },
-        'properties': {
+        'firstName': {
-          'id': {
+          'type': 'String',
-            'type': 'String',
+          'required': false,
-            'length': 20,
+          'length': 40,
-            'id': 1,
-          },
-          'email': {
-            'type': 'String',
-            'required': false,
-            'length': 60,
-            'mysql': {
-              'columnName': 'email',
-              'dataType': 'varchar',
-              'dataLength': 60,
-              'nullable': 'YES',
-            },
-          },
-          'firstName': {
-            'type': 'String',
-            'required': false,
-            'length': 40,
-          },
-          'lastName': {
-            'type': 'String',
-            'required': false,
-            'length': 40,
-          },
         },
-      };
+        'lastName': {
+          'type': 'String',
+          'required': false,
+          'length': 40,
+        },
+      },
+    };
 
     ds.createModel(schema_v1.name, schema_v1.properties, schema_v1.options);
 
@@ -130,16 +128,16 @@ describe('MySQL connector', function() {
         assert.equal(names[3], 'age');
 
         ds.connector.execute('SHOW INDEXES FROM customer_test', function(err, indexes) {
-          if (err) return done (err);
+          if (err) return done(err);
           assert(indexes);
           assert(indexes.length.should.be.above(1));
           assert.equal(indexes[1].Key_name, 'name_index');
           assert.equal(indexes[1].Non_unique, 0);
           ds.createModel(schema_v2.name, schema_v2.properties, schema_v2.options);
           ds.autoupdate(function(err, result) {
-            if (err) return done (err);
+            if (err) return done(err);
             ds.discoverModelProperties('customer_test', function(err, props) {
-              if (err) return done (err);
+              if (err) return done(err);
               assert.equal(props.length, 4);
               var names = props.map(function(p) {
                 return p.columnName;
@@ -149,7 +147,7 @@ describe('MySQL connector', function() {
               assert.equal(names[2], 'firstName');
               assert.equal(names[3], 'lastName');
               ds.connector.execute('SHOW INDEXES FROM customer_test', function(err, updatedindexes) {
-                if (err) return done (err);
+                if (err) return done(err);
                 assert(updatedindexes);
                 assert(updatedindexes.length.should.be.above(2));
                 assert.equal(updatedindexes[1].Key_name, 'updated_name_index');
@@ -222,6 +220,49 @@ describe('MySQL connector', function() {
     verifyMysqlColumnNameAutoupdate(done);
   });
 
+  it('should update the nullable property of "first_name" to false', function(done) {
+    // update the model "required" property
+    var schema = {
+      name: 'ColRenameTest',
+      options: {
+        idInjection: false,
+        mysql: {
+          schema: 'myapp_test',
+          table: 'col_rename_test',
+        },
+      },
+      properties: {
+        firstName: {
+          type: 'String',
+          required: true,
+          length: 40,
+          mysql: {
+            columnName: 'first_name',
+            dataType: 'varchar',
+            dataLength: 40,
+          },
+        },
+        lastName: {
+          type: 'String',
+          required: false,
+          length: 40,
+        },
+      },
+    };
+
+    ds.createModel(schema.name, schema.properties, schema.options);
+
+    // nullable should be updated to false
+    ds.autoupdate('ColRenameTest', function(err) {
+      assert.ifError(err);
+      ds.discoverModelProperties('col_rename_test', function(err, props) {
+        assert.equal(props[0].nullable, 'N');
+        assert.equal(props[0].columnName, 'first_name');
+        done();
+      });
+    });
+  });
+
   function verifyMysqlColumnNameAutoupdate(done) {
     ds.autoupdate('ColRenameTest', function(err) {
       ds.discoverModelProperties('col_rename_test', function(err, props) {