Skip to content

HCK-11976: fix invalid comma positioning in constraints #148

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
merged 1 commit into from
Jul 10, 2025
Merged

HCK-11976: fix invalid comma positioning in constraints #148

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
11 changes: 8 additions & 3 deletions forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@ const { commentIfDeactivated, checkAllKeysDeactivated, getColumnsList, wrapInQuo
const assignTemplates = require('../../utils/assignTemplates');
const templates = require('../templates');

const generateConstraintsString = (dividedConstraints, isParentActivated) => {
const generateConstraintsString = ({
dividedConstraints,
isParentActivated,
activatedConstraintsPrefix = ',\n\t',
deactivatedConstraintsPrefix = '\n\t',
}) => {
const deactivatedItemsAsString = commentIfDeactivated((dividedConstraints?.deactivatedItems || []).join(',\n\t'), {
isActivated: !isParentActivated,
isPartOfLine: true,
});
const activatedConstraints = dividedConstraints?.activatedItems?.length
? ',\n\t' + dividedConstraints.activatedItems.join(',\n\t')
? activatedConstraintsPrefix + dividedConstraints.activatedItems.join(',\n\t')
: '';

const deactivatedConstraints = dividedConstraints?.deactivatedItems?.length
? '\n\t' + deactivatedItemsAsString
? deactivatedConstraintsPrefix + deactivatedItemsAsString
: '';

return activatedConstraints + deactivatedConstraints;
Expand Down
23 changes: 17 additions & 6 deletions forward_engineering/ddlProvider/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const {
getNamePrefixedWithSchemaName,
getViewData,
getDbVersion,
addCommaPrefix,
} = require('../utils/general');
const assignTemplates = require('../utils/assignTemplates');
const {
Expand Down Expand Up @@ -137,19 +138,29 @@ module.exports = (baseProvider, options, app) => {
const constraintWarnings = getConstraintsWarnings(
keyConstraints.filter(({ errorMessage }) => errorMessage),
);
const keyConstraintsString = `${generateConstraintsString(
dividedKeysConstraints,
isActivated,
)}${constraintWarnings}`;
const doKeyConstraintsHaveWarnings = Boolean(constraintWarnings);
const keyConstraintsString = `${generateConstraintsString({
dividedConstraints: dividedKeysConstraints,
isParentActivated: isActivated,
})}${addCommaPrefix(constraintWarnings, doKeyConstraintsHaveWarnings)}`;
const keyConstraintsValue = partitionOf ? keyConstraintsString?.slice(1) : keyConstraintsString;

const dividedForeignKeys = divideIntoActivatedAndDeactivated(foreignKeyConstraints, key => key.statement);
const foreignKeyConstraintsString = generateConstraintsString(dividedForeignKeys, isActivated);
const shouldAddCommaPrefixToForeignKeysConstraints =
!doKeyConstraintsHaveWarnings || checkConstraints.length !== 0;
const foreignKeyConstraintsString = generateConstraintsString({
dividedConstraints: dividedForeignKeys,
isParentActivated: isActivated,
activatedConstraintsPrefix: addCommaPrefix('\n\t', shouldAddCommaPrefixToForeignKeysConstraints),
});

const columnDescriptions = '\n' + getColumnComments(tableName, columnDefinitions);
const template = partitionOf ? templates.createTablePartitionOf : templates.createTable;

const checkConstraintPrefix = partitionOf && !keyConstraintsString ? '\n\t' : ',\n\t';
const checkConstraintPrefix =
partitionOf && !keyConstraintsString
? '\n\t'
: `${addCommaPrefix('\n\t', !doKeyConstraintsHaveWarnings)}`;
const checkConstraintsValue = !_.isEmpty(checkConstraints)
? wrap(_.join(checkConstraints, ',\n\t'), checkConstraintPrefix, '')
: '';
Expand Down
3 changes: 3 additions & 0 deletions forward_engineering/utils/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ const wrap = (str, start = "'", end = "'") => {
}
};

const addCommaPrefix = (string, shouldAddComma) => (shouldAddComma ? `,${string}` : string);

const checkFieldPropertiesChanged = (compMod, propertiesToCheck) => {
return propertiesToCheck.some(prop => compMod?.oldField[prop] !== compMod?.newField[prop]);
};
Expand Down Expand Up @@ -298,4 +300,5 @@ module.exports = {
getSchemaNameFromCollection,
getGroupItemsByCompMode,
wrapInSingleQuotes,
addCommaPrefix,
};