Skip to content

public / sequelize

Go to a project

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

Commit 83dfc5ae by Andrii Stepaniuk Committed by Sushant
Options

fix(bulkCreate): updateOnDuplicate doesn't map back to fields (#9162)

1 parent 7c1eb9ba
Inline Side-by-side
Showing with 47 additions and 31 deletions
lib/dialects/abstract/query-generator.js
...@@ -217,9 +217,9 @@ const QueryGenerator = { ...@@ -217,9 +217,9 @@ const QueryGenerator = {
Parameters: table name + list of hashes of attribute-value-pairs. Parameters: table name + list of hashes of attribute-value-pairs.
@private @private
*/ */
bulkInsertQuery(tableName, attrValueHashes, options, rawAttributes) { bulkInsertQuery(tableName, fieldValueHashes, options, fieldMappedAttributes) {
options = options || {}; options = options || {};
rawAttributes = rawAttributes || {}; fieldMappedAttributes = fieldMappedAttributes || {};
const query = 'INSERT<%= ignoreDuplicates %> INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %><%= onDuplicateKeyUpdate %><%= returning %>;'; const query = 'INSERT<%= ignoreDuplicates %> INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %><%= onDuplicateKeyUpdate %><%= returning %>;';
const tuples = []; const tuples = [];
...@@ -227,31 +227,38 @@ const QueryGenerator = { ...@@ -227,31 +227,38 @@ const QueryGenerator = {
const allAttributes = []; const allAttributes = [];
let onDuplicateKeyUpdate = ''; let onDuplicateKeyUpdate = '';
for (const attrValueHash of attrValueHashes) { for (const fieldValueHash of fieldValueHashes) {
_.forOwn(attrValueHash, (value, key) => { _.forOwn(fieldValueHash, (value, key) => {
if (allAttributes.indexOf(key) === -1) { if (allAttributes.indexOf(key) === -1) {
allAttributes.push(key); allAttributes.push(key);
} }
if (
if (rawAttributes[key] && rawAttributes[key].autoIncrement === true) { fieldMappedAttributes[key]
&& fieldMappedAttributes[key].autoIncrement === true
) {
serials[key] = true; serials[key] = true;
} }
}); });
} }
for (const attrValueHash of attrValueHashes) { for (const fieldValueHash of fieldValueHashes) {
tuples.push('(' + allAttributes.map(key => { const values = allAttributes.map(key => {
if (this._dialect.supports.bulkDefault && serials[key] === true) { if (
return attrValueHash[key] || 'DEFAULT'; this._dialect.supports.bulkDefault
&& serials[key] === true
) {
return fieldValueHash[key] || 'DEFAULT';
} }
return this.escape(attrValueHash[key], rawAttributes[key], { context: 'INSERT' });
}).join(',') + ')'); return this.escape(fieldValueHash[key], fieldMappedAttributes[key], { context: 'INSERT' });
});
tuples.push(`(${values.join(',')})`);
} }
if (this._dialect.supports.updateOnDuplicate && options.updateOnDuplicate) { if (this._dialect.supports.updateOnDuplicate && options.updateOnDuplicate) {
onDuplicateKeyUpdate += ' ON DUPLICATE KEY UPDATE ' + options.updateOnDuplicate.map(attr => { onDuplicateKeyUpdate = ' ON DUPLICATE KEY UPDATE ' + options.updateOnDuplicate.map(attr => {
const field = rawAttributes && rawAttributes[attr] && rawAttributes[attr].field || attr; const key = this.quoteIdentifier(attr);
const key = this.quoteIdentifier(field);
return key + '=VALUES(' + key + ')'; return key + '=VALUES(' + key + ')';
}).join(','); }).join(',');
} }
......
lib/model.js
...@@ -2345,11 +2345,11 @@ class Model { ...@@ -2345,11 +2345,11 @@ class Model {
if (options.updateOnDuplicate) { if (options.updateOnDuplicate) {
// By default, all attributes except 'createdAt' can be updated // By default, all attributes except 'createdAt' can be updated
let updatableFields = _.pull(Object.keys(this.tableAttributes), 'createdAt'); let updatableAttributes = _.pull(Object.keys(this.tableAttributes), 'createdAt');
if (_.isArray(options.updateOnDuplicate) && !_.isEmpty(options.updateOnDuplicate)) { if (_.isArray(options.updateOnDuplicate) && !_.isEmpty(options.updateOnDuplicate)) {
updatableFields = _.intersection(updatableFields, options.updateOnDuplicate); updatableAttributes = _.intersection(updatableAttributes, options.updateOnDuplicate);
} }
options.updateOnDuplicate = updatableFields; options.updateOnDuplicate = updatableAttributes;
} }
options.model = this; options.model = this;
...@@ -2421,13 +2421,18 @@ class Model { ...@@ -2421,13 +2421,18 @@ class Model {
return _.omit(instance.dataValues, this._virtualAttributes); return _.omit(instance.dataValues, this._virtualAttributes);
}); });
// Map attributes for serial identification // Map attributes to fields for serial identification
const attributes = {}; const fieldMappedAttributes = {};
for (const attr in this.tableAttributes) { for (const attr in this.tableAttributes) {
attributes[this.rawAttributes[attr].field] = this.rawAttributes[attr]; fieldMappedAttributes[this.rawAttributes[attr].field || attr] = this.rawAttributes[attr];
} }
return this.QueryInterface.bulkInsert(this.getTableName(options), records, options, attributes).then(results => { // Map updateOnDuplicate attributes to fields
if (options.updateOnDuplicate) {
options.updateOnDuplicate = options.updateOnDuplicate.map(attr => this.rawAttributes[attr].field || attr);
}
return this.QueryInterface.bulkInsert(this.getTableName(options), records, options, fieldMappedAttributes).then(results => {
if (Array.isArray(results)) { if (Array.isArray(results)) {
results.forEach((result, i) => { results.forEach((result, i) => {
if (instances[i] && !instances[i].get(this.primaryKeyAttribute)) { if (instances[i] && !instances[i].get(this.primaryKeyAttribute)) {
......
lib/query-interface.js
...@@ -1001,14 +1001,19 @@ class QueryInterface { ...@@ -1001,14 +1001,19 @@ class QueryInterface {
* *
* @param {String} tableName Table name to insert record to * @param {String} tableName Table name to insert record to
* @param {Array} records List of records to insert * @param {Array} records List of records to insert
* @param {Object} options Various options, please see Model.bulkCreate options
* @param {Object} fieldMappedAttributes Various attributes mapped by field name
* *
* @return {Promise} * @return {Promise}
*/ */
bulkInsert(tableName, records, options, attributes) { bulkInsert(tableName, records, options, attributes) {
options = _.clone(options) || {}; options = _.clone(options) || {};
options.type = QueryTypes.INSERT; options.type = QueryTypes.INSERT;
const sql = this.QueryGenerator.bulkInsertQuery(tableName, records, options, attributes);
return this.sequelize.query(sql, options).then(results => results[0]); return this.sequelize.query(
this.QueryGenerator.bulkInsertQuery(tableName, records, options, attributes),
options
).then(results => results[0]);
} }
update(instance, tableName, values, identifier, options) { update(instance, tableName, values, identifier, options) {
......
test/integration/model/bulk-create.test.js
...@@ -17,7 +17,10 @@ describe(Support.getTestDialectTeaser('Model'), () => { ...@@ -17,7 +17,10 @@ describe(Support.getTestDialectTeaser('Model'), () => {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
secretValue: DataTypes.STRING, secretValue: {
type: DataTypes.STRING,
field: 'secret_value'
},
data: DataTypes.STRING, data: DataTypes.STRING,
intVal: DataTypes.INTEGER, intVal: DataTypes.INTEGER,
theDate: DataTypes.DATE, theDate: DataTypes.DATE,
......
test/unit/sql/insert.test.js
...@@ -83,11 +83,6 @@ describe(Support.getTestDialectTeaser('SQL'), () => { ...@@ -83,11 +83,6 @@ describe(Support.getTestDialectTeaser('SQL'), () => {
describe('bulkCreate', () => { describe('bulkCreate', () => {
it('bulk create with onDuplicateKeyUpdate', () => { it('bulk create with onDuplicateKeyUpdate', () => {
// Skip mssql for now, it seems broken
if (Support.getTestDialect() === 'mssql') {
return;
}
const User = Support.sequelize.define('user', { const User = Support.sequelize.define('user', {
username: { username: {
type: DataTypes.STRING, type: DataTypes.STRING,
...@@ -109,10 +104,11 @@ describe(Support.getTestDialectTeaser('SQL'), () => { ...@@ -109,10 +104,11 @@ describe(Support.getTestDialectTeaser('SQL'), () => {
timestamps: true timestamps: true
}); });
expectsql(sql.bulkInsertQuery(User.tableName, [{ user_name: 'testuser', pass_word: '12345' }], { updateOnDuplicate: ['username', 'password', 'updatedAt'] }, User.rawAttributes), expectsql(sql.bulkInsertQuery(User.tableName, [{ user_name: 'testuser', pass_word: '12345' }], { updateOnDuplicate: ['user_name', 'pass_word', 'updated_at'] }, User.fieldRawAttributesMap),
{ {
default: 'INSERT INTO `users` (`user_name`,`pass_word`) VALUES (\'testuser\',\'12345\');', default: 'INSERT INTO `users` (`user_name`,`pass_word`) VALUES (\'testuser\',\'12345\');',
postgres: 'INSERT INTO "users" ("user_name","pass_word") VALUES (\'testuser\',\'12345\');', postgres: 'INSERT INTO "users" ("user_name","pass_word") VALUES (\'testuser\',\'12345\');',
mssql: 'INSERT INTO [users] ([user_name],[pass_word]) VALUES (N\'testuser\',N\'12345\');',
mysql: 'INSERT INTO `users` (`user_name`,`pass_word`) VALUES (\'testuser\',\'12345\') ON DUPLICATE KEY UPDATE `user_name`=VALUES(`user_name`),`pass_word`=VALUES(`pass_word`),`updated_at`=VALUES(`updated_at`);' mysql: 'INSERT INTO `users` (`user_name`,`pass_word`) VALUES (\'testuser\',\'12345\') ON DUPLICATE KEY UPDATE `user_name`=VALUES(`user_name`),`pass_word`=VALUES(`pass_word`),`updated_at`=VALUES(`updated_at`);'
}); });
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!