From de7803f841f3a57da646525596d6169cdcacb32f Mon Sep 17 00:00:00 2001 From: Raul Stelescu Date: Mon, 24 Apr 2017 20:47:28 +0200 Subject: [PATCH] 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 | 3 +- test/mysql.autoupdate.test.js | 217 ++++++++++++++++++++-------------- 2 files changed, 131 insertions(+), 89 deletions(-) diff --git a/lib/migration.js b/lib/migration.js index 2fe870c..55e097e 100644 --- a/lib/migration.js +++ b/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)); } diff --git a/test/mysql.autoupdate.test.js b/test/mysql.autoupdate.test.js index 7bac69e..8094804 100644 --- a/test/mysql.autoupdate.test.js +++ b/test/mysql.autoupdate.test.js @@ -18,99 +18,97 @@ describe('MySQL connector', function() { }); it('should auto migrate/update tables', function(done) { - var schema_v1 = - { - 'name': 'CustomerTest', - 'options': { - 'idInjection': false, - 'mysql': { - 'schema': 'myapp_test', - 'table': 'customer_test', - }, - 'indexes': { - 'name_index': { - 'keys': { - 'name': 1, - }, - 'options': { - 'unique': true, - }, + var schema_v1 = { + 'name': 'CustomerTest', + 'options': { + 'idInjection': false, + 'mysql': { + 'schema': 'myapp_test', + 'table': 'customer_test', + }, + 'indexes': { + 'name_index': { + 'keys': { + 'name': 1, + }, + 'options': { + 'unique': true, }, }, }, - 'properties': { - 'id': { - 'type': 'String', - 'length': 20, - 'id': 1, - }, - 'name': { - 'type': 'String', - 'required': false, - 'length': 40, - }, - 'email': { - 'type': 'String', - 'required': true, - 'length': 40, - }, - 'age': { - 'type': 'Number', - 'required': false, - }, + }, + 'properties': { + 'id': { + 'type': 'String', + 'length': 20, + 'id': 1, }, - }; + 'name': { + 'type': 'String', + 'required': false, + 'length': 40, + }, + 'email': { + 'type': 'String', + 'required': true, + 'length': 40, + }, + 'age': { + 'type': 'Number', + 'required': false, + }, + }, + }; - var schema_v2 = - { - 'name': 'CustomerTest', - 'options': { - 'idInjection': false, + var schema_v2 = { + 'name': 'CustomerTest', + 'options': { + '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', - 'table': 'customer_test', - }, - 'indexes': { - 'updated_name_index': { - 'keys': { - 'firstName': 1, - 'lastName': -1, - }, - 'options': { - 'unique': true, - }, - }, + 'columnName': 'email', + 'dataType': 'varchar', + 'dataLength': 60, + 'nullable': 'YES', }, }, - 'properties': { - 'id': { - 'type': 'String', - 'length': 20, - '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, - }, + 'firstName': { + '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) {