From 1c17e17d286d4e52870fb895302d9ef863b5d714 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 7 Aug 2025 11:13:03 +0200 Subject: [PATCH 1/2] HCK-12258: ignore empty key constraints --- .../alterScriptHelpers/entityHelpers/primaryKeyHelper.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js index 509751b7..009a3127 100644 --- a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js +++ b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js @@ -285,9 +285,9 @@ const getAddCompositePkScriptDtos = (app, _, ddlProvider) => collection => { const { fullTableName } = getCollectionNames(_, collection); return newPrimaryKeys - .map(newPk => { - const keyData = getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0]; - + .map(newPk => getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0]) + .filter(Boolean) + .map(keyData => { const statementDto = ddlProvider.addPKConstraint( fullTableName, collection.isActivated, From 5d1260a57d398f223a11f7292a392ff141326362 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 7 Aug 2025 11:20:24 +0200 Subject: [PATCH 2/2] make similar --- .../entityHelpers/primaryKeyHelper.js | 2 +- .../entityHelpers/uniqueConstraintHelper.js | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js index 009a3127..d17b1861 100644 --- a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js +++ b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/primaryKeyHelper.js @@ -285,7 +285,7 @@ const getAddCompositePkScriptDtos = (app, _, ddlProvider) => collection => { const { fullTableName } = getCollectionNames(_, collection); return newPrimaryKeys - .map(newPk => getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0]) + .map(_ => getCompositePrimaryKeys({ ...collection, ...(collection?.role || {}) }, true)[0]) .filter(Boolean) .map(keyData => { const statementDto = ddlProvider.addPKConstraint( diff --git a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js index f5b5429d..78ae69ff 100644 --- a/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js +++ b/forward_engineering/helpers/alterScriptHelpers/entityHelpers/uniqueConstraintHelper.js @@ -94,13 +94,9 @@ const getAddCompositeUKScriptDtos = (app, _, ddlProvider) => collection => { const { fullTableName } = getCollectionNames(_, collection); return newUniqueConstraints - .map(newConstraint => { - const keyData = getCompositeUniqueKeys({ ...collection, ...(collection?.role || {}) }, true)[0]; - - if (!keyData) { - return null; - } - + .map(_ => getCompositeUniqueKeys({ ...collection, ...(collection?.role || {}) }, true)[0]) + .filter(Boolean) + .map(keyData => { const statementDto = ddlProvider.addUniqueConstraint( fullTableName, collection.isActivated, @@ -116,7 +112,7 @@ const getAddCompositeUKScriptDtos = (app, _, ddlProvider) => collection => { statementDto.isActivated, ); }) - .filter(scriptDto => Boolean(scriptDto?.script)); + .filter(scriptDto => Boolean(scriptDto.script)); }; /**