Skip to content

HCK-18460: comment out separate constraint statements of deactivated columns and tables #66

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
chulanovskyi-bs merged 1 commit into from
Nov 5, 2026
Merged

HCK-18460: comment out separate constraint statements of deactivated columns and tables #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions forward_engineering/alterScript/alterScriptHelpers/columnHelpers/nonNullConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || [];
Expand All @@ -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]) => {
Expand All @@ -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];
};
Expand Down
29 changes: 18 additions & 11 deletions forward_engineering/alterScript/alterScriptHelpers/entityHelpers/checkConstraintHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ const mapCheckConstraintNamesToChangeHistory = _ => collection => {
};

/**
* @return {(constraintHistory: Array<CheckConstraintHistoryEntry>, fullTableName: string) => Array<AlterScriptDto>}
* @return {(constraintHistory: Array<CheckConstraintHistoryEntry>, fullTableName: string, isActivated: boolean) => Array<AlterScriptDto>}
* */
const getDropCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => {
const getDropCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => {
const { wrapInQuotes } = require('../../../utils/general')(_);

return constraintHistory
Expand All @@ -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<CheckConstraintHistoryEntry>, fullTableName: string) => Array<AlterScriptDto>}
* @return {(constraintHistory: Array<CheckConstraintHistoryEntry>, fullTableName: string, isActivated: boolean) => Array<AlterScriptDto>}
* */
const getAddCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => {
const getAddCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => {
const { wrapInQuotes } = require('../../../utils/general')(_);

return constraintHistory
Expand All @@ -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<CheckConstraintHistoryEntry>, fullTableName: string) => Array<AlterScriptDto>}
* @return {(constraintHistory: Array<CheckConstraintHistoryEntry>, fullTableName: string, isActivated: boolean) => Array<AlterScriptDto>}
* */
const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName) => {
const getUpdateCheckConstraintScriptDtos = (_, ddlProvider) => (constraintHistory, fullTableName, isActivated) => {
const { wrapInQuotes } = require('../../../utils/general')(_);

return constraintHistory
Expand All @@ -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();
Expand All @@ -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];
Expand Down