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

Commit bf5fa6d7 by Sushant

fix(getForeignKeysForTables): properly parse multiple fk

1 parent 361fe599
...@@ -235,7 +235,7 @@ class Query extends AbstractQuery { ...@@ -235,7 +235,7 @@ class Query extends AbstractQuery {
} else if (this.isVersionQuery()) { } else if (this.isVersionQuery()) {
result = data[0].version; result = data[0].version;
} else if (this.isForeignKeysQuery()) { } else if (this.isForeignKeysQuery()) {
result = [data]; result = data;
} else if (this.isInsertQuery() || this.isUpdateQuery()) { } else if (this.isInsertQuery() || this.isUpdateQuery()) {
result = [result, rowCount]; result = [result, rowCount];
} else if (this.isShowConstraintsQuery()) { } else if (this.isShowConstraintsQuery()) {
......
...@@ -138,7 +138,7 @@ class Query extends AbstractQuery { ...@@ -138,7 +138,7 @@ class Query extends AbstractQuery {
} else if (this.isVersionQuery()) { } else if (this.isVersionQuery()) {
result = data[0].version; result = data[0].version;
} else if (this.isForeignKeysQuery()) { } else if (this.isForeignKeysQuery()) {
result = [data]; result = data;
} else if (this.isInsertQuery() || this.isUpdateQuery()) { } else if (this.isInsertQuery() || this.isUpdateQuery()) {
result = [result, data.affectedRows]; result = [result, data.affectedRows];
} else if (this.isShowConstraintsQuery()) { } else if (this.isShowConstraintsQuery()) {
......
...@@ -671,7 +671,7 @@ class QueryInterface { ...@@ -671,7 +671,7 @@ class QueryInterface {
options = _.assign({}, options || {}, { type: QueryTypes.FOREIGNKEYS }); options = _.assign({}, options || {}, { type: QueryTypes.FOREIGNKEYS });
return Promise.map(tableNames, tableName => return Promise.map(tableNames, tableName =>
this.sequelize.query(this.QueryGenerator.getForeignKeysQuery(tableName, this.sequelize.config.database), options).get(0) this.sequelize.query(this.QueryGenerator.getForeignKeysQuery(tableName, this.sequelize.config.database), options)
).then(results => { ).then(results => {
const result = {}; const result = {};
...@@ -680,7 +680,11 @@ class QueryInterface { ...@@ -680,7 +680,11 @@ class QueryInterface {
tableName = tableName.schema + '.' + tableName.tableName; tableName = tableName.schema + '.' + tableName.tableName;
} }
result[tableName] = _.compact(results[i]).map(r => r.constraint_name); result[tableName] = _.isArray(results[i])
? results[i].map(r => r.constraint_name)
: [results[i] && results[i].constraint_name];
result[tableName] = result[tableName].filter(_.identity);
}); });
return result; return result;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!