From 8a82ccbacbbf909a0f35417c4fa14ed56ea65f42 Mon Sep 17 00:00:00 2001 From: Kyrylo Burmelov Date: Fri, 14 Aug 2026 14:23:30 +0400 Subject: [PATCH] HCK-17370: Fix column order in CREATE INDEX ddl --- .../ddlProvider/ddlHelpers/index/getIndexOptions.js | 3 +-- forward_engineering/utils/general.js | 3 +-- properties_pane/entity_level/entityLevelConfig.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/forward_engineering/ddlProvider/ddlHelpers/index/getIndexOptions.js b/forward_engineering/ddlProvider/ddlHelpers/index/getIndexOptions.js index 04ffc5e..4f967df 100644 --- a/forward_engineering/ddlProvider/ddlHelpers/index/getIndexOptions.js +++ b/forward_engineering/ddlProvider/ddlHelpers/index/getIndexOptions.js @@ -28,8 +28,7 @@ const toUpperCase = value => toUpper(value); const getUpperCaseValue = prefix => getBasicValue({ prefix, modifier: toUpperCase }); /** - * Build index key list clause. The model stores the order as `ascending`/`descending`, which Db2 for z/OS spells - * `ASC`/`DESC`. + * Build index key list clause. * * @param {IndexKeyRef[]} [keys] Index keys. * @returns {string} Keys clause. diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js index 19d39e7..9a9a6a6 100644 --- a/forward_engineering/utils/general.js +++ b/forward_engineering/utils/general.js @@ -159,8 +159,7 @@ const columnMapToString = ({ name }) => wrapInQuotes(name ?? ''); * @returns {string} Column expression. */ const columnMapToStringWithOrder = ({ name, type }) => { - const order = type === 'descending' ? ' DESC' : type === 'ascending' ? ' ASC' : ''; - return wrapInQuotes(name) + order; + return [wrapInQuotes(name), type].filter(Boolean).join(' '); }; /** diff --git a/properties_pane/entity_level/entityLevelConfig.json b/properties_pane/entity_level/entityLevelConfig.json index dece027..31f5113 100644 --- a/properties_pane/entity_level/entityLevelConfig.json +++ b/properties_pane/entity_level/entityLevelConfig.json @@ -1001,7 +1001,7 @@ making sure that you maintain a proper JSON format. "propertyTooltip": "Index key columns with ASC, DESC, or RANDOM ordering.", "propertyType": "fieldList", "template": "orderedList", - "attributeList": ["asc", "desc", "random"], + "attributeList": ["", "ASC", "DESC", "RANDOM"], "validation": { "minLength": 1, "required": true