Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit c749746e by Mick Hansen
Options

[refactor] do UUID to CHAR/BINARY transformation for MySQL on datatype only, not… 

… on entire SQL, closes #1475
1 parent a6d8d0fb
Inline Side-by-side
Showing with 73 additions and 55 deletions
lib/dialects/mysql/query-generator.js
...@@ -36,7 +36,7 @@ module.exports = (function() { ...@@ -36,7 +36,7 @@ module.exports = (function() {
for (var attr in attributes) { for (var attr in attributes) {
if (attributes.hasOwnProperty(attr)) { if (attributes.hasOwnProperty(attr)) {
var dataType = this.mysqlDataTypeMapping(tableName, attr, attributes[attr]) var dataType = attributes[attr]
, match; , match;
if (Utils._.includes(dataType, 'PRIMARY KEY')) { if (Utils._.includes(dataType, 'PRIMARY KEY')) {
...@@ -240,72 +240,77 @@ module.exports = (function() { ...@@ -240,72 +240,77 @@ module.exports = (function() {
return Utils._.template(sql)({ tableName: this.quoteIdentifiers(tableName), indexName: indexName }); return Utils._.template(sql)({ tableName: this.quoteIdentifiers(tableName), indexName: indexName });
}, },
attributesToSQL: function(attributes) { attributeToSQL: function(attribute, options) {
var result = {}; if (!Utils._.isPlainObject(attribute)) {
attribute = {
type: attribute
};
}
for (var name in attributes) { var template;
var dataType = attributes[name];
var fieldName = dataType.field || name;
if (Utils._.isPlainObject(dataType)) { if (attribute.type.toString() === DataTypes.ENUM.toString()) {
var template; template = 'ENUM(' + Utils._.map(attribute.values, function(value) {
return this.escape(value);
}.bind(this)).join(', ') + ')';
} else {
template = this.dataTypeMapping(null, null, attribute.type.toString());
}
if (dataType.type.toString() === DataTypes.ENUM.toString()) { if (attribute.allowNull === false) {
template = 'ENUM(' + Utils._.map(dataType.values, function(value) { template += ' NOT NULL';
return this.escape(value); }
}.bind(this)).join(', ') + ')';
} else {
template = dataType.type.toString();
}
if (dataType.allowNull === false) { if (attribute.autoIncrement) {
template += ' NOT NULL'; template += ' auto_increment';
} }
if (dataType.autoIncrement) { // Blobs/texts cannot have a defaultValue
template += ' auto_increment'; if (attribute.type !== 'TEXT' && attribute.type._binary !== true && Utils.defaultValueSchemable(attribute.defaultValue)) {
} template += ' DEFAULT ' + this.escape(attribute.defaultValue);
}
// Blobs/texts cannot have a defaultValue if (attribute.unique === true) {
if (dataType.type !== 'TEXT' && dataType.type._binary !== true && Utils.defaultValueSchemable(dataType.defaultValue)) { template += ' UNIQUE';
template += ' DEFAULT ' + this.escape(dataType.defaultValue); }
}
if (dataType.unique === true) { if (attribute.primaryKey) {
template += ' UNIQUE'; template += ' PRIMARY KEY';
} }
if (dataType.primaryKey) { if (attribute.comment && Utils._.isString(attribute.comment) && attribute.comment.length) {
template += ' PRIMARY KEY'; template += ' COMMENT ' + this.escape(attribute.comment);
} }
if (dataType.comment && Utils._.isString(dataType.comment) && dataType.comment.length) { if (attribute.references) {
template += ' COMMENT ' + this.escape(dataType.comment); template += ' REFERENCES ' + this.quoteTable(attribute.references);
}
if (dataType.references) { if (attribute.referencesKey) {
template += ' REFERENCES ' + this.quoteTable(dataType.references); template += ' (' + this.quoteIdentifier(attribute.referencesKey) + ')';
} else {
template += ' (' + this.quoteIdentifier('id') + ')';
}
if (dataType.referencesKey) { if (attribute.onDelete) {
template += ' (' + this.quoteIdentifier(dataType.referencesKey) + ')'; template += ' ON DELETE ' + attribute.onDelete.toUpperCase();
} else { }
template += ' (' + this.quoteIdentifier('id') + ')';
}
if (dataType.onDelete) { if (attribute.onUpdate) {
template += ' ON DELETE ' + dataType.onDelete.toUpperCase(); template += ' ON UPDATE ' + attribute.onUpdate.toUpperCase();
} }
}
if (dataType.onUpdate) { return template;
template += ' ON UPDATE ' + dataType.onUpdate.toUpperCase(); },
}
} attributesToSQL: function(attributes, options) {
var result = {}
, key
, attribute;
result[fieldName] = template; for (key in attributes) {
} else { attribute = attributes[key];
result[fieldName] = dataType; result[attribute.field || key] = this.attributeToSQL(attribute, options);
}
} }
return result; return result;
...@@ -368,6 +373,9 @@ module.exports = (function() { ...@@ -368,6 +373,9 @@ module.exports = (function() {
}, },
mysqlDataTypeMapping: function(tableName, attr, dataType) { mysqlDataTypeMapping: function(tableName, attr, dataType) {
return this.dataTypeMapping(tableName, attr, dataType);
},
dataTypeMapping: function(tableName, attr, dataType) {
if (Utils._.includes(dataType, 'UUID')) { if (Utils._.includes(dataType, 'UUID')) {
dataType = dataType.replace(/UUID/, 'CHAR(36) BINARY'); dataType = dataType.replace(/UUID/, 'CHAR(36) BINARY');
} }
......
lib/dialects/postgres/query-generator.js
...@@ -731,6 +731,10 @@ module.exports = (function() { ...@@ -731,6 +731,10 @@ module.exports = (function() {
}, },
pgDataTypeMapping: function(tableName, attr, dataType) { pgDataTypeMapping: function(tableName, attr, dataType) {
return this.dataTypeMapping(tableName, attr, dataType);
},
dataTypeMapping: function(tableName, attr, dataType) {
if (Utils._.includes(dataType, 'PRIMARY KEY')) { if (Utils._.includes(dataType, 'PRIMARY KEY')) {
primaryKeys[tableName].push(attr); primaryKeys[tableName].push(attr);
dataType = dataType.replace(/PRIMARY KEY/, ''); dataType = dataType.replace(/PRIMARY KEY/, '');
...@@ -771,6 +775,8 @@ module.exports = (function() { ...@@ -771,6 +775,8 @@ module.exports = (function() {
return dataType; return dataType;
}, },
quoteIdentifier: function(identifier, force) { quoteIdentifier: function(identifier, force) {
if (identifier === '*') return identifier; if (identifier === '*') return identifier;
if (!force && this.options && this.options.quoteIdentifiers === false) { // default is `true` if (!force && this.options && this.options.quoteIdentifiers === false) { // default is `true`
......
lib/query-interface.js
...@@ -133,7 +133,9 @@ module.exports = (function() { ...@@ -133,7 +133,9 @@ module.exports = (function() {
} }
} }
attributes = self.QueryGenerator.attributesToSQL(attributes); attributes = self.QueryGenerator.attributesToSQL(attributes, {
context: 'createTable'
});
sql = self.QueryGenerator.createTableQuery(tableName, attributes, options); sql = self.QueryGenerator.createTableQuery(tableName, attributes, options);
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
...@@ -141,7 +143,9 @@ module.exports = (function() { ...@@ -141,7 +143,9 @@ module.exports = (function() {
}); });
}); });
} else { } else {
attributes = self.QueryGenerator.attributesToSQL(attributes); attributes = self.QueryGenerator.attributesToSQL(attributes, {
context: 'createTable'
});
sql = self.QueryGenerator.createTableQuery(tableName, attributes, options); sql = self.QueryGenerator.createTableQuery(tableName, attributes, options);
return self.sequelize.query(sql, null, options); return self.sequelize.query(sql, null, options);
......
test/dao-factory/create.test.js
...@@ -391,7 +391,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -391,7 +391,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}).then(function (monkey) { }).then(function (monkey) {
expect(monkey.get('monkeyId')).to.be.ok; expect(monkey.get('monkeyId')).to.be.ok;
}); });
}) });
it('is possible to use functions as default values', function (done) { it('is possible to use functions as default values', function (done) {
var self = this var self = this
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!