Skip to content

HCK-12459: fix the order of alter statements #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhii-filonenko merged 3 commits into from
Aug 29, 2025
Merged

HCK-12459: fix the order of alter statements #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e0af8d
HCK-12459: fix the order of alter statements
serhii-filonenko Aug 28, 2025
89d5752
HCK-12459: fix the order of alter statements
serhii-filonenko Aug 28, 2025
764f0ea
HCK-12459: fix the order of alter statements
serhii-filonenko Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions forward_engineering/helpers/alterScriptFromDeltaHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,14 @@ module.exports = _ => {
'deleteViewsScriptsDtos',
'addColumnDropCommentsScriptsDtos',
'addTablesDropCommentsScriptsDtos',
'deleteColumnScriptsDtos',
'deleteCollectionScriptsDtos',
'deleteUdtScriptsDtos',
'createUdtScriptsDtos',
'createCollectionsScriptsDtos',
'modifyCollectionScriptsDtos',
'addColumnScriptsDtos',
'modifyColumnScriptDtos',
'modifyCollectionScriptsDtos',
'deleteColumnScriptsDtos',
'createViewsScriptsDtos',
'modifiedViewsScriptsDtos',
'addSchemasDropCommentsScriptsDtos',
Expand Down
27 changes: 25 additions & 2 deletions forward_engineering/helpers/keyHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,14 @@ module.exports = app => {
};

const getKeys = (keys, jsonSchema) => {
const newProperties = getSchemaNewProperties(jsonSchema);
const properties = { ...newProperties, ...jsonSchema.properties };

return keys.map(key => {
return {
name: findName(key.keyId, jsonSchema.properties),
name: findName(key.keyId, properties),
order: key.type === 'descending' ? 'DESC' : 'ASC',
isActivated: checkIfActivated(key.keyId, jsonSchema.properties),
isActivated: checkIfActivated(key.keyId, properties),
};
});
};
Expand Down Expand Up @@ -246,6 +249,26 @@ module.exports = app => {
return [primaryKeyConstraint, ...uniqueKeyConstraints].filter(Boolean);
};

/**
* @param {JsonSchema} jsonSchema
* @returns {JsonSchema}
*/
const getSchemaNewProperties = jsonSchema => {
if (!Array.isArray(jsonSchema.compMod?.newProperties)) {
return {};
}

return jsonSchema.compMod.newProperties.reduce((properties, property) => {
return {
...properties,
[property.code || property.name]: {
...property,
GUID: property.id,
},
};
}, {});
};

return {
getTableKeyConstraints,
isInlineUnique,
Expand Down