Skip to content

HCK-13367: keep delimiter in the last column statement if there are constraints after #227

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 5, 2025
Merged

HCK-13367: keep delimiter in the last column statement if there are constraints after #227

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
476e275
HCK-13367: keep delimiter in the last column statement if there are c…
AlikRakhmonov Nov 5, 2025
d57fbab
fix names
AlikRakhmonov Nov 5, 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
25 changes: 21 additions & 4 deletions forward_engineering/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ module.exports = (baseProvider, options, app) => {
tab,
});

const hasActiveConstraints = ({
foreignKeyConstraints = [],
compositePrimaryKeys = [],
compositeUniqueKeys = [],
}) => {
return [...foreignKeyConstraints, ...compositePrimaryKeys, ...compositeUniqueKeys].some(
constraint => constraint.isActivated,
);
};

const getOutOfLineConstraints = (
isParentActivated,
foreignKeyConstraints = [],
Expand All @@ -117,7 +127,7 @@ module.exports = (baseProvider, options, app) => {
isParentActivated ? commentIfDeactivated(constraint.statement, constraint) : constraint.statement,
);

return !isEmpty(constraints) ? ',\n\t\t' + constraints.join(',\n\t\t') : '';
return isEmpty(constraints) ? '' : '\n\t\t' + constraints.join(',\n\t\t');
};

function insertNewlinesAtEdges(input) {
Expand Down Expand Up @@ -356,7 +366,6 @@ module.exports = (baseProvider, options, app) => {
const copyOptions = tab(getCopyOptions(tableData.copyOptions), ' ');
const atOrBefore = tab(getAtOrBefore(tableData.cloneParams), ' ');
const columns = tableData.columns.map(column => commentIfDeactivated(column.statement, column));
const columnDefinitions = joinActivatedAndDeactivatedStatements({ statements: columns, indent: '\n\t\t' });
const tagsStatement = getTagStatement({
tags: tableData.tableTags,
isCaseSensitive: tableData.isCaseSensitive,
Expand Down Expand Up @@ -446,7 +455,11 @@ module.exports = (baseProvider, options, app) => {
),
orReplace,
tableIfNotExists,
column_definitions: columnDefinitions,
column_definitions: joinActivatedAndDeactivatedStatements({
statements: columns,
indent: '\n\t\t',
keepLastDelimiter: hasActiveConstraints(tableData),
}),
out_of_line_constraints: getOutOfLineConstraints(
isActivated,
tableData.foreignKeyConstraints,
Expand All @@ -466,7 +479,11 @@ module.exports = (baseProvider, options, app) => {
[clusterKeys, stageFileFormat, copyOptions, dataRetentionTime, copyGrants, tagsStatement],
comment,
),
column_definitions: columnDefinitions,
column_definitions: joinActivatedAndDeactivatedStatements({
statements: columns,
indent: '\n\t\t',
keepLastDelimiter: hasActiveConstraints(tableData),
}),
out_of_line_constraints: getOutOfLineConstraints(
isActivated,
tableData.foreignKeyConstraints,
Expand Down
21 changes: 14 additions & 7 deletions forward_engineering/utils/joinActivatedAndDeactivatedStatements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@ const getDelimiter = ({ index, numberOfStatements, lastIndexOfActivatedStatement
* }}
* @return {string}
* */
const joinActivatedAndDeactivatedStatements = ({ statements = [], delimiter = ',', indent = '\n' }) => {
const joinActivatedAndDeactivatedStatements = ({
statements = [],
delimiter = ',',
indent = '\n',
keepLastDelimiter = false,
}) => {
const lastIndexOfActivatedStatement = statements.findLastIndex(statement => !statement.startsWith('//'));
const numberOfStatements = statements.length;

return statements
.map((statement, index) => {
const currentDelimiter = getDelimiter({
index,
numberOfStatements,
lastIndexOfActivatedStatement,
delimiter,
});
const currentDelimiter = keepLastDelimiter
? delimiter
: getDelimiter({
index,
numberOfStatements,
lastIndexOfActivatedStatement,
delimiter,
});

return statement + currentDelimiter;
})
Expand Down