不要怂,就是干,撸起袖子干!

Commit fe90a98a by Overlook Motel

Fix wrong identifier pt 1

1 parent 2e4ab67d
Showing with 4 additions and 8 deletions
...@@ -170,6 +170,10 @@ module.exports = (function() { ...@@ -170,6 +170,10 @@ module.exports = (function() {
this.foreignIdentifier = this.targetAssociation.identifier this.foreignIdentifier = this.targetAssociation.identifier
this.targetAssociation.foreignIdentifier = this.identifier this.targetAssociation.foreignIdentifier = this.identifier
if (isForeignKeyDeletionAllowedFor.call(this, this.source, this.foreignIdentifier)) {
delete this.source.rawAttributes[this.foreignIdentifier]
}
if (this.isSelfAssociation && this.foreignIdentifier === this.identifier) { if (this.isSelfAssociation && this.foreignIdentifier === this.identifier) {
this.foreignIdentifier = Utils._.camelizeIf( this.foreignIdentifier = Utils._.camelizeIf(
[Utils.singularize(this.as, this.source.options.language), this.source.primaryKeyAttribute].join("_"), [Utils.singularize(this.as, this.source.options.language), this.source.primaryKeyAttribute].join("_"),
...@@ -177,14 +181,6 @@ module.exports = (function() { ...@@ -177,14 +181,6 @@ module.exports = (function() {
); );
} }
if (isForeignKeyDeletionAllowedFor.call(this, this.source, this.foreignIdentifier)) {
delete this.source.rawAttributes[this.foreignIdentifier]
}
if (isForeignKeyDeletionAllowedFor.call(this, this.target, this.identifier)) {
delete this.targetAssociation.source.rawAttributes[this.identifier]
}
// remove any PKs previously defined by sequelize // remove any PKs previously defined by sequelize
Utils._.each(this.through.rawAttributes, function(attribute, attributeName) { Utils._.each(this.through.rawAttributes, function(attribute, attributeName) {
if (attribute.primaryKey === true && attribute._autoGenerated === true) { if (attribute.primaryKey === true && attribute._autoGenerated === true) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!