Fixes after rebase

lib/dialects/mysql/query-generator.js

@@ -456,17 +456,17 @@ module.exports = (function() {
 
             if(dataType.referencesKeys) {
               // TODO: This isn't really right - for composite primary keys we need a different approach
-              template += "(" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
+              template += " (" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
             } else {
-              template += "(" + Utils.addTicks('id') + ")"
+              template += " (" + Utils.addTicks('id') + ")"
             }
 
             if(dataType.onDelete) {
-              template += " ON DELETE " + dataType.onDeleteAction.toUpperCase()
+              template += " ON DELETE " + dataType.onDelete.toUpperCase()
             }
 
             if(dataType.onUpdate) {
-              template += " ON UPDATE " + dataType.onUpdateAction.toUpperCase()
+              template += " ON UPDATE " + dataType.onUpdate.toUpperCase()
             }
 
           }