Skip to content

Commit 54b6813

Browse files
HCK-13030: ignore generating FK/UK if no columns (#170)
* HCK-13030: ignore generating FK/UK if no columns * line position * fix explicitly in PK/UK
1 parent 2fe9ea6 commit 54b6813

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,13 @@ const getAddCompositePkScriptDtos = collection => {
259259
return newPrimaryKeys
260260
.map(newPk => {
261261
const ddlConfig = getCreateCompositePKDDLProviderConfig(newPk, entityName, collection);
262+
if (_.isEmpty(ddlConfig.columns)) {
263+
return null;
264+
}
262265
const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig);
263266
return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated);
264267
})
265-
.filter(scriptDto => Boolean(scriptDto.script));
268+
.filter(scriptDto => Boolean(scriptDto?.script));
266269
};
267270

268271
/**

forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,13 @@ const getAddCompositeUniqueKeyScriptDtos = (collection, dbVersion) => {
277277
collection,
278278
dbVersion,
279279
);
280+
if (_.isEmpty(ddlConfig.columns)) {
281+
return null;
282+
}
280283
const statementDto = alterKeyConstraint(fullTableName, isCollectionActivated, ddlConfig);
281284
return new KeyScriptModificationDto(statementDto.statement, fullTableName, false, statementDto.isActivated);
282285
})
283-
.filter(scriptDto => Boolean(scriptDto.script));
286+
.filter(scriptDto => Boolean(scriptDto?.script));
284287
};
285288

286289
/**

forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const alterKeyConstraint = (tableName, isParentActivated, keyData) => {
150150
const constraintStatementDto = createKeyConstraint(templates, isParentActivated)(keyData);
151151
return {
152152
statement: assignTemplates(templates.addPkConstraint, {
153-
constraintStatement: (constraintStatementDto.statement || '').trim(),
153+
constraintStatement: constraintStatementDto.statement.trim(),
154154
tableName,
155155
}),
156156
isActivated: constraintStatementDto.isActivated,

0 commit comments

Comments
 (0)