mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 07:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: transaction cannot be rolled back because it has been finished with state: rollback

Browse Source
This commit is contained in:
chenos 2022-09-19 21:03:06 +08:00
parent 12c3915a57
commit 6dacec4158
1 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
packages/core/database/src/update-associations.ts
View File

@ -6,7 +6,7 @@ import {
HasOne,
Hookable,
ModelCtor,
Transactionable,
Transactionable
} from 'sequelize';
import { Model } from './model';
import { UpdateGuard } from './update-guard';
@ -130,37 +130,44 @@ export async function updateAssociations(instance: Model, values: any, options:
const keys = Object.keys(values);
for (const key of Object.keys(modelAssociations(instance))) {
if (keys.includes(key)) {
await updateAssociation(instance, key, values[key], {
...options,
transaction,
});
try {
for (const key of Object.keys(modelAssociations(instance))) {
if (keys.includes(key)) {
await updateAssociation(instance, key, values[key], {
...options,
transaction,
});
}
}
}
// update through table values
for (const belongsToMany of belongsToManyAssociations(instance)) {
// @ts-ignore
const throughModel = belongsToMany.through.model;
const throughModelName = throughModel.name;
// update through table values
for (const belongsToMany of belongsToManyAssociations(instance)) {
// @ts-ignore
const throughModel = belongsToMany.through.model;
const throughModelName = throughModel.name;
if (values[throughModelName] && options.sourceModel) {
const where = {
[belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
[belongsToMany.otherKey]: options.sourceModel.get(belongsToMany.targetKey),
};
if (values[throughModelName] && options.sourceModel) {
const where = {
[belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
[belongsToMany.otherKey]: options.sourceModel.get(belongsToMany.targetKey),
};
await throughModel.update(values[throughModel.name], {
where,
context: options.context,
transaction,
});
await throughModel.update(values[throughModel.name], {
where,
context: options.context,
transaction,
});
}
}
}
if (newTransaction) {
await transaction.commit();
if (newTransaction) {
await transaction.commit();
}
} catch (error) {
if (newTransaction) {
await transaction.rollback();
}
throw error;
}
}
@ -251,7 +258,7 @@ export async function updateSingleAssociation(
return false;
}
const { context, updateAssociationValues = [], transaction = await model.sequelize.transaction() } = options;
const { context, updateAssociationValues = [], transaction } = options;
const keys = getKeysByPrefix(updateAssociationValues, key);
try {
@ -261,9 +268,6 @@ export async function updateSingleAssociation(
const removeAssociation = async () => {
await model[setAccessor](null, { transaction });
model.setDataValue(key, null);
if (!options.transaction) {
await transaction.commit();
}
return true;
};
@ -273,19 +277,12 @@ export async function updateSingleAssociation(
if (isStringOrNumber(value)) {
await model[setAccessor](value, { context, transaction });
if (!options.transaction) {
await transaction.commit();
}
return true;
}
if (value instanceof Model) {
await model[setAccessor](value, { context, transaction });
model.setDataValue(key, value);
if (!options.transaction) {
await transaction.commit();
}
return true;
}
@ -323,9 +320,6 @@ export async function updateSingleAssociation(
updateAssociationValues: keys,
});
model.setDataValue(key, instance);
if (!options.transaction) {
await transaction.commit();
}
return true;
}
}
@ -342,13 +336,7 @@ export async function updateSingleAssociation(
if (association.targetKey) {
model.setDataValue(association.foreignKey, instance[dataKey]);
}
if (!options.transaction) {
await transaction.commit();
}
} catch (error) {
if (!options.transaction) {
await transaction.rollback();
}
throw error;
}
}
@ -376,7 +364,7 @@ export async function updateMultipleAssociation(
return false;
}
const { context, updateAssociationValues = [], transaction = await model.sequelize.transaction() } = options;
const { context, updateAssociationValues = [], transaction } = options;
const keys = getKeysByPrefix(updateAssociationValues, key);
try {
@ -467,11 +455,7 @@ export async function updateMultipleAssociation(
}
model.setDataValue(key, list1.concat(list3));
if (!options.transaction) {
await transaction.commit();
}
} catch (error) {
await transaction.rollback();
throw error;
}
}