dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 18:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed delete changeset rows

Browse Source
This commit is contained in:
Jan Prochazka
2022-02-13 09:33:15 +01:00
parent ada7ee7cab
commit bc593d25ae
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/datalib/src/ChangeSet.ts
View File

@@ -337,6 +337,25 @@ export function revertChangeSetRowChanges(changeSet: ChangeSet, definition: Chan
return changeSet;
}
function consolidateInsertIndexes(changeSet: ChangeSet, name: NamedObjectInfo): ChangeSet {
const indexes = changeSet.inserts
.filter(x => x.pureName == name.pureName && x.schemaName == name.schemaName)
.map(x => x.insertedRowIndex);
indexes.sort((a, b) => a - b);
if (indexes[indexes.length - 1] != indexes.length - 1) {
return {
...changeSet,
inserts: changeSet.inserts.map(x => ({
...x,
insertedRowIndex: indexes.indexOf(x.insertedRowIndex),
})),
};
}
return changeSet;
}
export function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet {
let [fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
if (fieldName == 'updates') {
@@ -344,7 +363,7 @@ export function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetR
[fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
}
if (fieldName == 'inserts') {
return revertChangeSetRowChanges(changeSet, definition);
return consolidateInsertIndexes(revertChangeSetRowChanges(changeSet, definition), definition);
} else {
if (existingItem && fieldName == 'deletes') return changeSet;
return {
@@ -390,11 +409,7 @@ export function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectIn
};
}
export function changeSetInsertDocuments(
changeSet: ChangeSet,
documents: any[],
name?: NamedObjectInfo
): ChangeSet {
export function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo): ChangeSet {
const insertedRows = getChangeSetInsertedRows(changeSet, name);
return {
...changeSet,