Skip to content

Commit 1156462

Browse files
AlikRakhmonovAlikRakhmonov
authored
fix: some keys might be null/undefined after cleanup (#167)
1 parent 9e3d5f3 commit 1156462

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎forward_engineering/alterScript/alterScriptHelpers/entityHelpers/primaryKeyHelper.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const wasCompositePkChangedInTransitionFromCompositeToRegular = collection => {
9595
}
9696
const constraintOptions = getCustomPropertiesOfRegularPkForComparisonWithRegularPkOptions(newColumnJsonSchema);
9797
const areOptionsEqual = oldPrimaryKeys.some(compositePk => {
98-
if (compositePk.compositePrimaryKey.length !== amountOfColumnsInRegularPk) {
98+
if (compositePk.compositePrimaryKey?.length !== amountOfColumnsInRegularPk) {
9999
return false;
100100
}
101101
const oldCompositePkAsRegularPkOptions =
@@ -139,7 +139,7 @@ const wasCompositePkChangedInTransitionFromRegularToComposite = collection => {
139139
}
140140
const constraintOptions = getCustomPropertiesOfRegularPkForComparisonWithRegularPkOptions(oldColumnJsonSchema);
141141
const areOptionsEqual = newPrimaryKeys.some(compositePk => {
142-
if (compositePk.compositePrimaryKey.length !== amountOfColumnsInRegularPk) {
142+
if (compositePk.compositePrimaryKey?.length !== amountOfColumnsInRegularPk) {
143143
return false;
144144
}
145145
const oldCompositePkAsRegularPkOptions =
@@ -187,7 +187,7 @@ const getCreateCompositePKDDLProviderConfig = (primaryKey, entityName, entity) =
187187
const constraintName = getConstraintNameForCompositePk(primaryKey, entityName);
188188
const pkColumns = _.toPairs(entity.role.properties)
189189
.filter(([name, jsonSchema]) =>
190-
Boolean(primaryKey.compositePrimaryKey.find(keyDto => keyDto.keyId === jsonSchema.GUID)),
190+
Boolean(primaryKey.compositePrimaryKey?.find(keyDto => keyDto.keyId === jsonSchema.GUID)),
191191
)
192192
.map(([name, jsonSchema]) => ({
193193
name,
@@ -444,10 +444,10 @@ const wasRegularPkChangedInTransitionFromCompositeToRegular = (columnJsonSchema,
444444
* */
445445
const oldPrimaryKeys = pkDto.old || [];
446446
const wasTheFieldACompositePrimaryKey = oldPrimaryKeys.some(compPk =>
447-
compPk.compositePrimaryKey.some(pk => pk.keyId === oldColumnJsonSchema.GUID),
447+
compPk.compositePrimaryKey?.some(pk => pk.keyId === oldColumnJsonSchema.GUID),
448448
);
449449
const isTheFieldACompositePrimaryKey = newPrimaryKeys.some(compPk =>
450-
compPk.compositePrimaryKey.some(pk => pk.keyId === columnJsonSchema.GUID),
450+
compPk.compositePrimaryKey?.some(pk => pk.keyId === columnJsonSchema.GUID),
451451
);
452452

453453
const wasCompositePkRemoved = wasTheFieldACompositePrimaryKey && !isTheFieldACompositePrimaryKey;
@@ -458,7 +458,7 @@ const wasRegularPkChangedInTransitionFromCompositeToRegular = (columnJsonSchema,
458458
// to amount of regular pk columns, we must recreate PK
459459
const constraintOptions = getCustomPropertiesOfRegularPkForComparisonWithRegularPkOptions(columnJsonSchema);
460460
const areOptionsEqual = oldPrimaryKeys.some(oldCompositePk => {
461-
if (oldCompositePk.compositePrimaryKey.length !== amountOfColumnsInRegularPk) {
461+
if (oldCompositePk.compositePrimaryKey?.length !== amountOfColumnsInRegularPk) {
462462
return false;
463463
}
464464
const oldCompositePkAsRegularPkOptions =
@@ -498,10 +498,10 @@ const wasRegularPkChangedInTransitionFromRegularToComposite = (columnJsonSchema,
498498
* */
499499
const oldPrimaryKeys = pkDto.old || [];
500500
const wasTheFieldACompositePrimaryKey = oldPrimaryKeys.some(compPk =>
501-
compPk.compositePrimaryKey.some(pk => pk.keyId === oldColumnJsonSchema.GUID),
501+
compPk.compositePrimaryKey?.some(pk => pk.keyId === oldColumnJsonSchema.GUID),
502502
);
503503
const isTheFieldACompositePrimaryKey = newPrimaryKeys.some(compPk =>
504-
compPk.compositePrimaryKey.some(pk => pk.keyId === columnJsonSchema.GUID),
504+
compPk.compositePrimaryKey?.some(pk => pk.keyId === columnJsonSchema.GUID),
505505
);
506506

507507
const wasCompositePkAdded = isTheFieldACompositePrimaryKey && !wasTheFieldACompositePrimaryKey;
@@ -512,7 +512,7 @@ const wasRegularPkChangedInTransitionFromRegularToComposite = (columnJsonSchema,
512512
// to amount of regular pk columns, we must recreate PK
513513
const constraintOptions = getCustomPropertiesOfRegularPkForComparisonWithRegularPkOptions(oldColumnJsonSchema);
514514
const areOptionsEqual = newPrimaryKeys.some(oldCompositePk => {
515-
if (oldCompositePk.compositePrimaryKey.length !== amountOfColumnsInRegularPk) {
515+
if (oldCompositePk.compositePrimaryKey?.length !== amountOfColumnsInRegularPk) {
516516
return false;
517517
}
518518
const oldCompositePkAsRegularPkOptions =

‎forward_engineering/alterScript/alterScriptHelpers/entityHelpers/uniqueKeyHelper.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const wasCompositeUniqueKeyChangedInTransitionFromCompositeToRegular = collectio
9999
const constraintOptions =
100100
getCustomPropertiesOfRegularUniqueKeyForComparisonWithRegularUniqueKeyOptions(newColumnJsonSchema);
101101
const areOptionsEqual = oldUniqueKeys.some(compositeUniqueKey => {
102-
if (compositeUniqueKey.compositeUniqueKey.length !== amountOfColumnsInRegularUniqueKey) {
102+
if (compositeUniqueKey.compositeUniqueKey?.length !== amountOfColumnsInRegularUniqueKey) {
103103
return false;
104104
}
105105
const oldCompositeUniqueKeyAsRegularUniqueKeyOptions =
@@ -144,7 +144,7 @@ const wasCompositeUniqueKeyChangedInTransitionFromRegularToComposite = collectio
144144
const constraintOptions =
145145
getCustomPropertiesOfRegularUniqueKeyForComparisonWithRegularUniqueKeyOptions(oldColumnJsonSchema);
146146
const areOptionsEqual = newUniqueKeys.some(compositeUniqueKey => {
147-
if (compositeUniqueKey.compositeUniqueKey.length !== amountOfColumnsInRegularUniqueKey) {
147+
if (compositeUniqueKey.compositeUniqueKey?.length !== amountOfColumnsInRegularUniqueKey) {
148148
return false;
149149
}
150150
const oldCompositeUniqueKeyAsRegularUniqueKeyOptions =
@@ -192,7 +192,7 @@ const getCreateCompositeUniqueKeyDDLProviderConfig = (uniqueKey, entityName, ent
192192
const constraintName = getConstraintNameForCompositeUniqueKey(uniqueKey, entityName);
193193
const uniqueColumns = _.toPairs(entity.role.properties)
194194
.filter(([name, jsonSchema]) =>
195-
Boolean(uniqueKey.compositeUniqueKey.find(keyDto => keyDto.keyId === jsonSchema.GUID)),
195+
Boolean(uniqueKey.compositeUniqueKey?.find(keyDto => keyDto.keyId === jsonSchema.GUID)),
196196
)
197197
.map(([name, jsonSchema]) => ({
198198
name,
@@ -476,10 +476,10 @@ const wasRegularUniqueKeyChangedInTransitionFromCompositeToRegular = (columnJson
476476
* */
477477
const oldUniqueKeys = uniqueDto.old || [];
478478
const wasTheFieldACompositeUniqueKey = oldUniqueKeys.some(compUniqueKey =>
479-
compUniqueKey.compositeUniqueKey.some(unique => unique.keyId === oldColumnJsonSchema.GUID),
479+
compUniqueKey.compositeUniqueKey?.some(unique => unique.keyId === oldColumnJsonSchema.GUID),
480480
);
481481
const isTheFieldACompositeUniqueKey = newUniqueKeys.some(compUniqueKey =>
482-
compUniqueKey.compositeUniqueKey.some(unique => unique.keyId === columnJsonSchema.GUID),
482+
compUniqueKey.compositeUniqueKey?.some(unique => unique.keyId === columnJsonSchema.GUID),
483483
);
484484

485485
const wasCompositeUniqueKeyRemoved = wasTheFieldACompositeUniqueKey && !isTheFieldACompositeUniqueKey;
@@ -491,7 +491,7 @@ const wasRegularUniqueKeyChangedInTransitionFromCompositeToRegular = (columnJson
491491
const constraintOptions =
492492
getCustomPropertiesOfRegularUniqueKeyForComparisonWithRegularUniqueKeyOptions(columnJsonSchema);
493493
const areOptionsEqual = oldUniqueKeys.some(oldCompositeUniqueKey => {
494-
if (oldCompositeUniqueKey.compositeUniqueKey.length !== amountOfColumnsInRegularUniqueKey) {
494+
if (oldCompositeUniqueKey.compositeUniqueKey?.length !== amountOfColumnsInRegularUniqueKey) {
495495
return false;
496496
}
497497
const oldCompositeUniqueKeyAsRegularUniqueKeyOptions =
@@ -531,10 +531,10 @@ const wasRegularUniqueKeyChangedInTransitionFromRegularToComposite = (columnJson
531531
* */
532532
const oldUniqueKeys = uniqueDto.old || [];
533533
const wasTheFieldACompositeUniqueKey = oldUniqueKeys.some(compUniqueKey =>
534-
compUniqueKey.compositeUniqueKey.some(unique => unique.keyId === oldColumnJsonSchema.GUID),
534+
compUniqueKey.compositeUniqueKey?.some(unique => unique.keyId === oldColumnJsonSchema.GUID),
535535
);
536536
const isTheFieldACompositeUniqueKey = newUniqueKeys.some(compUniqueKey =>
537-
compUniqueKey.compositeUniqueKey.some(unique => unique.keyId === columnJsonSchema.GUID),
537+
compUniqueKey.compositeUniqueKey?.some(unique => unique.keyId === columnJsonSchema.GUID),
538538
);
539539

540540
const wasCompositeUniqueKeyAdded = isTheFieldACompositeUniqueKey && !wasTheFieldACompositeUniqueKey;
@@ -546,7 +546,7 @@ const wasRegularUniqueKeyChangedInTransitionFromRegularToComposite = (columnJson
546546
const constraintOptions =
547547
getCustomPropertiesOfRegularUniqueKeyForComparisonWithRegularUniqueKeyOptions(oldColumnJsonSchema);
548548
const areOptionsEqual = newUniqueKeys.some(oldCompositeUniqueKey => {
549-
if (oldCompositeUniqueKey.compositeUniqueKey.length !== amountOfColumnsInRegularUniqueKey) {
549+
if (oldCompositeUniqueKey.compositeUniqueKey?.length !== amountOfColumnsInRegularUniqueKey) {
550550
return false;
551551
}
552552
const oldCompositeUniqueKeyAsRegularUniqueKeyOptions =

0 commit comments

Comments
 (0)