Skip to content

Commit 69b3255

Browse files
committed
fix explicitly in PK/UK
1 parent 42c81c1 commit 69b3255

3 files changed

Lines changed: 12 additions & 14 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: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ const foreignActiveKeysToString = keys => {
6969
* }}
7070
* */
7171
const createKeyConstraint = (templates, isParentActivated) => keyData => {
72-
if (_.isEmpty(keyData.columns)) {
73-
return {
74-
statement: '',
75-
isActivated: false,
76-
};
77-
}
7872
const constraintName = wrapInQuotes(_.trim(keyData.name));
7973
const isAllColumnsDeactivated = checkAllKeysDeactivated(keyData.columns || []);
8074
const columns = !_.isEmpty(keyData.columns)
@@ -155,12 +149,10 @@ const createInlineCheckConstraint = checkConstraint => {
155149
const alterKeyConstraint = (tableName, isParentActivated, keyData) => {
156150
const constraintStatementDto = createKeyConstraint(templates, isParentActivated)(keyData);
157151
return {
158-
statement: constraintStatementDto.statement
159-
? assignTemplates(templates.addPkConstraint, {
160-
constraintStatement: constraintStatementDto.statement.trim(),
161-
tableName,
162-
})
163-
: '',
152+
statement: assignTemplates(templates.addPkConstraint, {
153+
constraintStatement: constraintStatementDto.statement.trim(),
154+
tableName,
155+
}),
164156
isActivated: constraintStatementDto.isActivated,
165157
};
166158
};

0 commit comments

Comments
 (0)