From 70b1ffc8abda83461ff28c6423fa36028adf0b73 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Mon, 16 Nov 2026 16:13:11 +0100 Subject: [PATCH 1/2] HCK-18469: Invalid processing of deactivated objects in DDL tab --- .../entityHelpers/indexesHelper.js | 38 +++++++++++++----- .../entityHelpers/primaryKeyHelper.js | 28 ++++++++++--- .../entityHelpers/uniqueKeyHelper.js | 16 +++++++- .../ddlProvider/ddlHelpers/indexHelper.js | 40 ++++++++++++++----- .../ddlProvider/ddlHelpers/viewHelper.js | 32 ++++++++++++--- .../ddlProvider/ddlProvider.js | 27 ++++++++----- forward_engineering/utils/general.js | 2 +- 7 files changed, 138 insertions(+), 45 deletions(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js index a4757c4..af38b4f 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/indexesHelper.js @@ -2,7 +2,11 @@ const _ = require('lodash'); const { AlterScriptDto, SCRIPT_TYPE } = require('../../types/AlterScriptDto.js'); const { AlterCollectionDto } = require('../../types/AlterCollectionDto'); const { AlterIndexDto } = require('../../types/AlterIndexDto'); -const { prepareNameForScriptFormat } = require('../../../utils/general.js'); +const { + prepareNameForScriptFormat, + isParentContainerActivated, + isObjectInDeltaModelActivated, +} = require('../../../utils/general.js'); /** * @typedef {{ @@ -135,11 +139,17 @@ const getDeletedIndexesScriptDtos = */ const getDeleteIndexScriptDto = ({ ddlProvider, scriptFormat }) => - ({ index }) => { + ({ index, collection }) => { const name = prepareNameForScriptFormat(scriptFormat)(index.indxName); const script = ddlProvider.dropIndex({ name }); - - return AlterScriptDto.getInstance(script, index.isActivated, true, SCRIPT_TYPE.dropEntityIndex); + const isCollectionActivated = + isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); + return AlterScriptDto.getInstance( + script, + isCollectionActivated && index.isActivated, + true, + SCRIPT_TYPE.dropEntityIndex, + ); }; /** @@ -176,8 +186,14 @@ const getAddIndexScriptDto = ...indexWithAddedKeyNames, schemaName: collection?.role?.compMod?.bucketProperties?.name, }); - - return AlterScriptDto.getInstance(script, index.isActivated, false, SCRIPT_TYPE.createEntityIndex); + const isCollectionActivated = + isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); + return AlterScriptDto.getInstance( + script, + isCollectionActivated && index.isActivated, + false, + SCRIPT_TYPE.createEntityIndex, + ); }; /** @@ -220,13 +236,15 @@ const getModifyIndexScriptDto = ({ modifiedIndex: { oldIndex, newIndex }, collection }) => { const oldName = prepareNameForScriptFormat(scriptFormat)(oldIndex.indxName); const newName = prepareNameForScriptFormat(scriptFormat)(newIndex.indxName); + const isActivated = + newIndex.isActivated && isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); let alterScriptDtos = []; if (shouldDropAndRecreateIndex({ oldIndex, newIndex })) { const dropIndexDto = AlterScriptDto.getInstance( ddlProvider.dropIndex({ name: oldName }), - newIndex.isActivated, + isActivated, true, SCRIPT_TYPE.dropEntityIndex, ); @@ -236,7 +254,7 @@ const getModifyIndexScriptDto = ...newIndexWithAddedKeyNames, schemaName: collection?.role?.compMod?.bucketProperties?.name, }), - newIndex.isActivated, + isActivated, false, SCRIPT_TYPE.createEntityIndex, ); @@ -249,7 +267,7 @@ const getModifyIndexScriptDto = if (shouldRenameIndex) { const alterIndexDto = AlterScriptDto.getInstance( ddlProvider.alterIndexRename({ oldName, newName }), - newIndex.isActivated, + isActivated, false, SCRIPT_TYPE.alterEntityIndex, ); @@ -259,7 +277,7 @@ const getModifyIndexScriptDto = if (shouldAlterIndexRebuild({ oldIndex, newIndex })) { const alterIndexRebuildDto = AlterScriptDto.getInstance( ddlProvider.alterIndexRebuild({ name: newName, indexData: newIndex }), - newIndex.isActivated, + isActivated, false, SCRIPT_TYPE.alterEntityIndex, ); diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js index 3173e39..251c516 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js @@ -168,13 +168,19 @@ const getAddCompositePkScriptDtos = ({ scriptFormat, collection }) => { const collectionSchema = getSchemaOfAlterCollection(collection); const fullTableName = getFullCollectionName(scriptFormat)(collectionSchema); + const isCollectionActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); return newPrimaryKeys .map(newPk => { const ddlConfig = getCreateCompositePKDDLProviderConfig(newPk, collection); - const statementDto = alterKeyConstraint(fullTableName, collection.isActivated, ddlConfig); + const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig); - return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated); + return new KeyScriptModificationDto( + statementDto.statement, + fullTableName, + false, + statementDto.isActivated && isCollectionActivated, + ); }) .filter(scriptDto => Boolean(scriptDto.script)); }; @@ -407,6 +413,7 @@ const getAddPkScriptDtos = ({ scriptFormat, collection }) => { const collectionSchema = getSchemaOfAlterCollection(collection); const fullTableName = getFullCollectionName(scriptFormat)(collectionSchema); + const isCollectionActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); return _.toPairs(collection.properties) .filter(([name, jsonSchema]) => { @@ -424,8 +431,13 @@ const getAddPkScriptDtos = ({ scriptFormat, collection }) => { }) .map(([name, jsonSchema]) => { const ddlConfig = getCreateRegularPKDDLProviderConfig(name, jsonSchema); - const statementDto = alterKeyConstraint(fullTableName, collection.isActivated, ddlConfig); - return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated); + const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig); + return new KeyScriptModificationDto( + statementDto.statement, + fullTableName, + false, + isCollectionActivated && statementDto.isActivated, + ); }) .filter(scriptDto => Boolean(scriptDto.script)); }; @@ -487,9 +499,15 @@ const getModifyPkConstraintsScriptDtos = ({ scriptFormat, collection }) => { const allDtos = [...modifyCompositePkScriptDtos, ...modifyPkScriptDtos].filter(Boolean); const sortedAllDtos = sortModifyKeyConstraints(allDtos); + const isCollectionActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); return sortedAllDtos.map(dto => - AlterScriptDto.getInstance(dto.script, dto.isActivated, dto.isDropScript, SCRIPT_TYPE.alterEntity), + AlterScriptDto.getInstance( + dto.script, + isCollectionActivated && dto.isActivated, + dto.isDropScript, + SCRIPT_TYPE.alterEntity, + ), ); }; diff --git a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js index 301abaf..87e8faf 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js @@ -170,13 +170,19 @@ const getAddCompositeUniqueKeyScriptDtos = ({ scriptFormat, collection }) => { const collectionSchema = getSchemaOfAlterCollection(collection); const fullTableName = getFullCollectionName(scriptFormat)(collectionSchema); + const isCollectionActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); return newUniqueKeys .map(newUniqueKey => { const ddlConfig = getCreateCompositeUniqueKeyDDLProviderConfig(newUniqueKey, collection); const statementDto = alterKeyConstraint(fullTableName, collection.isActivated, ddlConfig); - return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated); + return new KeyScriptModificationDto( + statementDto.statement, + fullTableName, + false, + isCollectionActivated && statementDto.isActivated, + ); }) .filter(scriptDto => Boolean(scriptDto.script)); }; @@ -412,6 +418,7 @@ const getAddUniqueKeyScriptDtos = ({ scriptFormat, collection }) => { const collectionSchema = getSchemaOfAlterCollection(collection); const fullTableName = getFullCollectionName(scriptFormat)(collectionSchema); + const isCollectionActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection); return _.toPairs(collection.properties) .filter(([name, jsonSchema]) => { @@ -430,7 +437,12 @@ const getAddUniqueKeyScriptDtos = ({ scriptFormat, collection }) => { .map(([name, jsonSchema]) => { const ddlConfig = getCreateRegularUniqueKeyDDLProviderConfig(name, jsonSchema); const statementDto = alterKeyConstraint(fullTableName, collection.isActivated, ddlConfig); - return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated); + return new KeyScriptModificationDto( + statementDto.statement, + fullTableName, + false, + isCollectionActivated && statementDto.isActivated, + ); }) .filter(scriptDto => Boolean(scriptDto.script)); }; diff --git a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js b/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js index 87af732..2bf16be 100644 --- a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js +++ b/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js @@ -3,7 +3,7 @@ */ const _ = require('lodash'); -const { normalizeLineEndings } = require('../../utils/general'); +const { normalizeLineEndings, commentIfDeactivated } = require('../../utils/general'); module.exports = ({ prepareName, getNamePrefixedWithSchemaName }) => { const getIndexType = indexType => { @@ -64,22 +64,40 @@ module.exports = ({ prepareName, getNamePrefixedWithSchemaName }) => { * @param column_expression {string | undefined} * @return {string} * */ - const getIndexKeys = ({ indxKey, column_expression }) => { - const columnExpression = _.trim(column_expression); + const getIndexKeys = ({ index, isParentActivated }) => { + const columnExpression = _.trim(index.column_expression); if (columnExpression) { - return `\n(\n\t${columnExpression}\n)\n\t`; + return { + statement: `\n(\n\t${columnExpression}\n)\n\t`, + hasActiveColumns: true, + }; } - if (_.isArray(indxKey) && !_.isEmpty(indxKey)) { - const indexedColumnsClause = _.map( - indxKey, - ({ name, type }) => `${prepareName(name)} ${_.toUpper(type)}`, - ).join(',\n\t'); - return `\n(\n\t${indexedColumnsClause}\n)\n\t`; + let hasActiveColumns = false; + let statement = ''; + + if (Array.isArray(index.indxKey) && !_.isEmpty(index.indxKey)) { + const indexedColumns = _.map(index.indxKey, ({ name, type, isActivated }) => { + if (isActivated && !hasActiveColumns) { + hasActiveColumns = true; + } + return { + statement: `${prepareName(name)} ${_.toUpper(type)}`, + isActivated, + }; + }); + + const indexedColumnsClause = indexedColumns + .map(column => commentIfDeactivated(column.statement, { isActivated: column.isActivated })) + .join(',\n\t'); + statement = `\n(\n\t${indexedColumnsClause}\n)\n\t`; } - return ''; + return { + statement, + hasActiveColumns, + }; }; /** diff --git a/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js b/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js index 87d111e..9a3a81d 100644 --- a/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js +++ b/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js @@ -1,4 +1,5 @@ const _ = require('lodash'); +const { commentIfDeactivated } = require('../../utils/general'); module.exports = ({ prepareName }) => { const getViewType = ({ editioning, editionable }) => { @@ -17,12 +18,14 @@ module.exports = ({ prepareName }) => { } }; - const getViewData = keys => { + const getViewData = ({ keys, isViewActivated }) => { if (!Array.isArray(keys)) { return { tables: [], columns: [] }; } - return keys.reduce( + let hasActiveColumns = false; + + const { columns, tables } = keys.reduce( (result, key) => { // Keys without a tableName are plain columns that don't reference any table/view column. // They exist for documentation purposes only and can't take part in the SELECT statement. @@ -30,10 +33,16 @@ module.exports = ({ prepareName }) => { return result; } - const tableName = `${prepareName(key.dbName)}.${prepareName(key.tableName)}`; + let tableName = `${prepareName(key.dbName)}.${prepareName(key.tableName)}`; - if (!result.tables.includes(tableName)) { - result.tables.push(tableName); + const addedTable = result.tables.find(t => t.statement === tableName); + if (addedTable) { + addedTable.isActivated = addedTable.isActivated || key.isActivated; + } else { + result.tables.push({ + statement: tableName, + isActivated: key.isActivated, + }); } result.columns.push({ @@ -41,6 +50,10 @@ module.exports = ({ prepareName }) => { isActivated: key.isActivated, }); + if (key.isActivated && !hasActiveColumns) { + hasActiveColumns = true; + } + return result; }, { @@ -48,6 +61,15 @@ module.exports = ({ prepareName }) => { columns: [], }, ); + + const join = items => + items.map(item => commentIfDeactivated(item.statement, { isActivated: item.isActivated })).join(',\n\t\t'); + + return { + hasActiveColumns, + columnsAsString: join(columns), + tablesAsString: join(tables), + }; }; return { diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index 51b3b0e..0bf0528 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -524,7 +524,7 @@ const ddlProvider = (baseProvider, options, app) => { } const indexType = getIndexType(index.indxType); - const keys = getIndexKeys(index); + const { statement: keys, hasActiveColumns } = getIndexKeys({ index, isParentActivated }); const indexOptions = getIndexOptions(index); const dbVersion = options.dbVersion || ''; const usingTryCatchWrapper = shouldUseTryCatchIfNotExistsWrapper(dbVersion); @@ -550,12 +550,12 @@ const ddlProvider = (baseProvider, options, app) => { if (usingTryCatchWrapper) { return commentIfDeactivated(statement, { - isActivated: index.isActivated, + isActivated: isParentActivated && index.isActivated && hasActiveColumns, }); } return commentIfDeactivated(statement, { - isActivated: index.isActivated, + isActivated: isParentActivated && index.isActivated && hasActiveColumns, }); }, @@ -630,8 +630,8 @@ const ddlProvider = (baseProvider, options, app) => { createViewIndex(viewName, index, dbData, isParentActivated) { const name = getIndexName({ index }); const indexType = getIndexType(index.indxType); - const keys = getIndexKeys(index); - const options = getIndexOptions(index, isParentActivated); + const { statement: keys, hasActiveColumns } = getIndexKeys({ index, isParentActivated }); + const options = getIndexOptions(index); if (!index.materialized) { return; @@ -646,7 +646,7 @@ const ddlProvider = (baseProvider, options, app) => { tableName: getNamePrefixedWithSchemaName(viewName, index.schemaName), }), { - isActivated: index.isActivated, + isActivated: isParentActivated && index.isActivated && hasActiveColumns, }, ); }, @@ -655,11 +655,13 @@ const ddlProvider = (baseProvider, options, app) => { return viewData.materialized ? 'MATERIALIZED VIEW' : 'TABLE'; }, - createView(viewData, dbData, isActivated) { + createView(viewData, dbData, isViewActivated) { const viewName = getNamePrefixedWithSchemaName(viewData.name, viewData.schemaName); - const { columns, tables } = getViewData(viewData.keys); - const columnsAsString = columns.map(column => column.statement).join(',\n\t\t'); + const { columnsAsString, tablesAsString, hasActiveColumns } = getViewData({ + keys: viewData.keys, + isViewActivated, + }); const comment = viewData.description ? '\n' + @@ -671,10 +673,11 @@ const ddlProvider = (baseProvider, options, app) => { '\n' : '\n'; - const selectStatement = _.trim(viewData.selectStatement) + const hasCustomSelectStatement = Boolean(_.trim(viewData.selectStatement)); + const selectStatement = hasCustomSelectStatement ? _.trim(tab(viewData.selectStatement)) : assignTemplates(templates.viewSelectStatement, { - tableName: tables.join(', '), + tableName: tablesAsString, keys: columnsAsString, }); @@ -703,6 +706,8 @@ const ddlProvider = (baseProvider, options, app) => { createViewDdl += ';'; } + const isActivated = isViewActivated && (hasCustomSelectStatement || hasActiveColumns); + return commentIfDeactivated(createViewDdl + comment + synonymsStatements, { isActivated }); }, diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js index 52e0820..94eb4a3 100644 --- a/forward_engineering/utils/general.js +++ b/forward_engineering/utils/general.js @@ -222,7 +222,7 @@ const getSchemaOfAlterCollection = collection => { }; const isObjectInDeltaModelActivated = modelObject => { - return modelObject.compMod?.isActivated?.new ?? modelObject.role?.isActivated; + return modelObject.compMod?.isActivated?.new ?? modelObject.role?.isActivated ?? true; }; const isParentContainerActivated = collection => { From a74a42640fc5ce99efd1692f1cb3c321ac9c99b5 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Mon, 16 Nov 2026 16:48:27 +0100 Subject: [PATCH 2/2] fix --- .../ddlProvider/ddlHelpers/indexHelper.js | 7 ++++++- .../ddlProvider/ddlHelpers/viewHelper.js | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js b/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js index 2bf16be..047749b 100644 --- a/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js +++ b/forward_engineering/ddlProvider/ddlHelpers/indexHelper.js @@ -88,8 +88,13 @@ module.exports = ({ prepareName, getNamePrefixedWithSchemaName }) => { }; }); + // Do not comment the column when (!index.isActivated || !isParentActivated || !hasActiveColumns) because the whole index will be commented out + const isActivatedByNeed = !index.isActivated || !isParentActivated || !hasActiveColumns; + const indexedColumnsClause = indexedColumns - .map(column => commentIfDeactivated(column.statement, { isActivated: column.isActivated })) + .map(column => + commentIfDeactivated(column.statement, { isActivated: isActivatedByNeed || column.isActivated }), + ) .join(',\n\t'); statement = `\n(\n\t${indexedColumnsClause}\n)\n\t`; } diff --git a/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js b/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js index 9a3a81d..f13dcc1 100644 --- a/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js +++ b/forward_engineering/ddlProvider/ddlHelpers/viewHelper.js @@ -63,7 +63,15 @@ module.exports = ({ prepareName }) => { ); const join = items => - items.map(item => commentIfDeactivated(item.statement, { isActivated: item.isActivated })).join(',\n\t\t'); + items + .map( + // Do not comment the column or table when (!isViewActivated || !hasActiveColumns) because the whole view will be commented out + item => + commentIfDeactivated(item.statement, { + isActivated: !isViewActivated || !hasActiveColumns || item.isActivated, + }), + ) + .join(',\n\t\t'); return { hasActiveColumns,