From 8a29bafeccbb530ca3bd7214a36f145c09a8746d Mon Sep 17 00:00:00 2001 From: Sylvie Paindeville Date: Thu, 5 Nov 2026 13:17:18 +0100 Subject: [PATCH] HCK-18460: comment out separate constraint statements of deactivated columns and tables Co-authored-by: Cursor --- .../columnHelpers/nonNullConstraintHelper.js | 15 +++++++--- .../entityHelpers/checkConstraintHelper.js | 29 ++++++++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js index f4ca3f4..53c0a21 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js @@ -6,6 +6,7 @@ const { AlterScriptDto } = require('../../types/AlterScriptDto'); const getModifyNonNullColumnsScriptDtos = (_, ddlProvider) => collection => { const { getFullTableName, wrapInQuotes } = require('../../../utils/general')(_); const fullTableName = getFullTableName(collection); + const isCollectionActivated = collection.role?.isActivated !== false; const currentRequiredColumnNames = collection.required || []; const previousRequiredColumnNames = collection.role.required || []; @@ -20,8 +21,11 @@ const getModifyNonNullColumnsScriptDtos = (_, ddlProvider) => collection => { const shouldAddForNewName = columnNamesToAddNotNullConstraint.includes(name); return shouldAddForNewName && !shouldRemoveForOldName; }) - .map(([columnName]) => ddlProvider.setNotNullConstraint(fullTableName, wrapInQuotes(columnName))) - .map(script => AlterScriptDto.getInstance([script], true, false)); + .map(([columnName, jsonSchema]) => { + const script = ddlProvider.setNotNullConstraint(fullTableName, wrapInQuotes(columnName)); + const isActivated = isCollectionActivated && jsonSchema.isActivated !== false; + return AlterScriptDto.getInstance([script], isActivated, false); + }); const removeNotNullConstraint = _.toPairs(collection.properties) .filter(([name, jsonSchema]) => { @@ -30,8 +34,11 @@ const getModifyNonNullColumnsScriptDtos = (_, ddlProvider) => collection => { const shouldAddForNewName = columnNamesToAddNotNullConstraint.includes(name); return shouldRemoveForOldName && !shouldAddForNewName; }) - .map(([name]) => ddlProvider.dropNotNullConstraint(fullTableName, wrapInQuotes(name))) - .map(script => AlterScriptDto.getInstance([script], true, true)); + .map(([name, jsonSchema]) => { + const script = ddlProvider.dropNotNullConstraint(fullTableName, wrapInQuotes(name)); + const isActivated = isCollectionActivated && jsonSchema.isActivated !== false; + return AlterScriptDto.getInstance([script], isActivated, true); + }); return [...addNotNullConstraintsScript, ...removeNotNullConstraint]; }; diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js index 7dae3c4..11d93ab 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js @@ -38,9 +38,9 @@ const mapCheckConstraintNamesToChangeHistory = _ => collection => { }; /** - * @return {(constraintHistory: Array, fullTableName: string) => Array} + * @return {(constraintHistory: Array, fullTableName: string, isActivated: boolean) => Array} * */ -const getDropCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => { +const getDropCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => { const { wrapInQuotes } = require('../../../utils/general')(_); return constraintHistory @@ -49,13 +49,13 @@ const getDropCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, const wrappedConstraintName = wrapInQuotes(historyEntry.old.chkConstrName); return ddlProvider.dropConstraint(fullTableName, wrappedConstraintName); }) - .map(script => AlterScriptDto.getInstance([script], true, true)); + .map(script => AlterScriptDto.getInstance([script], isActivated, true)); }; /** - * @return {(constraintHistory: Array, fullTableName: string) => Array} + * @return {(constraintHistory: Array, fullTableName: string, isActivated: boolean) => Array} * */ -const getAddCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => { +const getAddCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => { const { wrapInQuotes } = require('../../../utils/general')(_); return constraintHistory @@ -64,13 +64,13 @@ const getAddCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, const { chkConstrName, constrExpression } = historyEntry.new; return ddlProvider.addCheckConstraint(fullTableName, wrapInQuotes(chkConstrName), constrExpression); }) - .map(script => AlterScriptDto.getInstance([script], true, false)); + .map(script => AlterScriptDto.getInstance([script], isActivated, false)); }; /** - * @return {(constraintHistory: Array, fullTableName: string) => Array} + * @return {(constraintHistory: Array, fullTableName: string, isActivated: boolean) => Array} * */ -const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => { +const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => { const { wrapInQuotes } = require('../../../utils/general')(_); return constraintHistory @@ -94,8 +94,8 @@ const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistor ); return [ - AlterScriptDto.getInstance([dropConstraintScript], true, true), - AlterScriptDto.getInstance([addConstraintScript], true, false), + AlterScriptDto.getInstance([dropConstraintScript], isActivated, true), + AlterScriptDto.getInstance([addConstraintScript], isActivated, false), ]; }) .flat(); @@ -108,15 +108,22 @@ const getModifyCheckConstraintScriptDtos = (_, ddlProvider) => collection => { const { getFullTableName } = require('../../../utils/general')(_); const fullTableName = getFullTableName(collection); const constraintHistory = mapCheckConstraintNamesToChangeHistory(_)(collection); + const isActivated = collection.role?.isActivated !== false; - const addCheckConstraintScripts = getAddCheckConstraintScriptDtos(_, ddlProvider)(constraintHistory, fullTableName); + const addCheckConstraintScripts = getAddCheckConstraintScriptDtos(_, ddlProvider)( + constraintHistory, + fullTableName, + isActivated, + ); const dropCheckConstraintScripts = getDropCheckConstraintScriptDtos(_, ddlProvider)( constraintHistory, fullTableName, + isActivated, ); const updateCheckConstraintScripts = getUpdateCheckConstraintScriptDtos(_, ddlProvider)( constraintHistory, fullTableName, + isActivated, ); return [...addCheckConstraintScripts, ...dropCheckConstraintScripts, ...updateCheckConstraintScripts];