Skip to content

HCK-13408: Separate comment statements are not commented when their parent is inactive #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VitaliiBedletskyi merged 2 commits into from
Nov 6, 2025
Merged

HCK-13408: Separate comment statements are not commented when their parent is inactive #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7929d53
HCK-13408: Separate comment statements are not commented when their p…
AlikRakhmonov Nov 6, 2025
08ab566
Merge branch 'develop' into HCK-13408
VitaliiBedletskyi Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions forward_engineering/helpers/alterScriptHelpers/alterContainerHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { prepareContainerLevelData } = require('./common');
const { getDbName } = require('../general');
const { getDbName, isObjectInDeltaModelActivated } = require('../general');
const { commentIfDeactivated } = require('../commentHelpers/commentDeactivatedHelper');

const getAddContainerScript = ddlProvider => container => {
const containerData = { ...container.role, name: getDbName(container.role) };
Expand All @@ -17,8 +18,8 @@ const getDeleteContainerScript = ddlProvider => container => {

const getModifyContainerScript = ddlProvider => container => {
const preparedData = ddlProvider.hydrateAlterSchema(container);

return ddlProvider.alterSchema(preparedData);
const isActivated = isObjectInDeltaModelActivated(container);
return commentIfDeactivated(ddlProvider.alterSchema(preparedData), { isActivated });
};

module.exports = {
Expand Down
19 changes: 15 additions & 4 deletions forward_engineering/helpers/alterScriptHelpers/alterEntityHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ const _ = require('lodash');
const { checkFieldPropertiesChanged, getNames, getBaseAndContainerNames } = require('./common');
const { createColumnDefinitionBySchema } = require('./createColumnDefinition');
const { commentIfDeactivated } = require('../commentHelpers/commentDeactivatedHelper');
const { getEntityName, getFullName, getName, toString } = require('../general');
const {
getEntityName,
getFullName,
getName,
toString,
isParentContainerActivated,
isObjectInDeltaModelActivated,
} = require('../general');
const { getSetTagValue, getUnsetTagValue } = require('../../helpers/tagHelper');
const assignTemplates = require('../../utils/assignTemplates');
const templates = require('../../configs/templates');
Expand Down Expand Up @@ -58,8 +65,8 @@ const getDeleteCollectionScript = collection => {

const getModifyCollectionScript = ddlProvider => collection => {
const data = ddlProvider.hydrateAlertTable(collection);

return ddlProvider.alterTable(data);
const isActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection);
return commentIfDeactivated(ddlProvider.alterTable(data), { isActivated });
};

const getAddColumnScript =
Expand Down Expand Up @@ -120,6 +127,7 @@ const getModifyColumnScript =
`ALTER TABLE IF EXISTS ${fullName} RENAME COLUMN ${jsonSchema.compMod.oldField.name} TO ${jsonSchema.compMod.newField.name};`,
);

const isParentActivated = isParentContainerActivated(collection) && isObjectInDeltaModelActivated(collection);
const nameToJsonSchemaPairs = _.toPairs(collection.properties);

const changeTypeScripts = nameToJsonSchemaPairs
Expand Down Expand Up @@ -166,10 +174,13 @@ const getModifyColumnScript =

// new or modified comment
if (oldComment !== comment) {
return assignTemplates(templates.columnComment, {
const statement = assignTemplates(templates.columnComment, {
fullName: `${fullName}.${columnName}`,
comment: escapeString(scriptFormat, comment),
});
return commentIfDeactivated(statement, {
isActivated: jsonSchema.isActivated && isParentActivated,
});
}
})
.filter(Boolean);
Expand Down
7 changes: 4 additions & 3 deletions forward_engineering/helpers/alterScriptHelpers/alterViewHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const _ = require('lodash');
const { getNames, getBaseAndContainerNames } = require('./common');
const { getFullName, getName } = require('../general');
const { getFullName, getName, isParentContainerActivated, isObjectInDeltaModelActivated } = require('../general');
const { commentIfDeactivated } = require('../commentHelpers/commentDeactivatedHelper');

const getViewName = view => view?.code || view.name || '';

Expand Down Expand Up @@ -42,8 +43,8 @@ const getDeleteViewScript = view => {

const getModifyViewScript = ddlProvider => view => {
const data = ddlProvider.hydrateAlterView(view);

return ddlProvider.alterView(data);
const isActivated = isParentContainerActivated(view) && isObjectInDeltaModelActivated(view);
return commentIfDeactivated(ddlProvider.alterView(data), { isActivated });
};

const getKeys = ({ viewSchema, collectionRefsDefinitionsMap, ddlProvider, mapProperties }) => {
Expand Down