From 34e62f6ed8a94f91da4aad2ad3ad619b5c1d3432 Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Tue, 12 Aug 2025 14:19:34 +0300 Subject: [PATCH] HCK-12336: remove redundant ASC keyword --- forward_engineering/helpers/constraintsHelper.js | 2 +- forward_engineering/helpers/keyHelper.js | 13 ------------- .../helpers/defineFieldsCompositeKeyConstraints.js | 4 +--- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/forward_engineering/helpers/constraintsHelper.js b/forward_engineering/helpers/constraintsHelper.js index ee84f84..887ef6a 100644 --- a/forward_engineering/helpers/constraintsHelper.js +++ b/forward_engineering/helpers/constraintsHelper.js @@ -9,7 +9,7 @@ module.exports = app => { const createKeyConstraint = (templates, terminator, isParentActivated) => keyData => { const partition = keyData.partition ? ` ON [${keyData.partition}]` : ''; - const columnMapToString = ({ name, order }) => `[${name}] ${order}`.trim(); + const columnMapToString = ({ name }) => `[${name}]`.trim(); const isAllColumnsDeactivated = checkAllKeysDeactivated(keyData.columns); diff --git a/forward_engineering/helpers/keyHelper.js b/forward_engineering/helpers/keyHelper.js index 91e6f85..6785b73 100644 --- a/forward_engineering/helpers/keyHelper.js +++ b/forward_engineering/helpers/keyHelper.js @@ -65,16 +65,6 @@ module.exports = app => { } }; - const getOrder = order => { - if (_.toLower(order) === 'asc') { - return 'ASC'; - } else if (_.toLower(order) === 'desc') { - return 'DESC'; - } else { - return ''; - } - }; - const hydrateUniqueOptions = (options, columnName, isActivated) => clean({ keyType: 'UNIQUE', @@ -82,7 +72,6 @@ module.exports = app => { columns: [ { name: columnName, - order: getOrder(options['order']), isActivated: isActivated, }, ], @@ -108,7 +97,6 @@ module.exports = app => { columns: [ { name: columnName, - order: getOrder(options['order']), isActivated: isActivated, }, ], @@ -143,7 +131,6 @@ module.exports = app => { return keys.map(key => { return { name: findName(key.keyId, jsonSchema.properties), - order: key.type === 'descending' ? 'DESC' : 'ASC', isActivated: checkIfActivated(key.keyId, jsonSchema.properties), }; }); diff --git a/reverse_engineering/reverseEngineeringService/helpers/defineFieldsCompositeKeyConstraints.js b/reverse_engineering/reverseEngineeringService/helpers/defineFieldsCompositeKeyConstraints.js index b18af1a..faa9980 100644 --- a/reverse_engineering/reverseEngineeringService/helpers/defineFieldsCompositeKeyConstraints.js +++ b/reverse_engineering/reverseEngineeringService/helpers/defineFieldsCompositeKeyConstraints.js @@ -7,7 +7,7 @@ const PRIMARY_KEY = 'PRIMARY KEY'; const reverseCompositeKeys = keyConstraintsInfo => { const keyCompositionStatuses = getKeyConstraintsCompositionStatuses(keyConstraintsInfo); return keyConstraintsInfo.reduce((reversedKeys, keyConstraintInfo) => { - const { columnName, constraintName, constraintType, isDescending } = keyConstraintInfo; + const { columnName, constraintName, constraintType } = keyConstraintInfo; const compositionStatus = keyCompositionStatuses[constraintName]; const existingReversedKey = reversedKeys[constraintName]; const keyType = constraintType === PRIMARY_KEY ? 'compositePrimaryKey' : 'compositeUniqueKey'; @@ -24,7 +24,6 @@ const reverseCompositeKeys = keyConstraintsInfo => { [keyType]: [ { name: columnName, - type: isDescending ? 'descending' : 'ascending', }, ], }, @@ -44,7 +43,6 @@ const reverseCompositeKeys = keyConstraintsInfo => { ...existingReversedKey[keyType], { name: columnName, - type: isDescending ? 'descending' : 'ascending', }, ], },