Skip to content

EspoCRM – Open Source CRM Application

fix cascade removal conversion

Yuriie94a7953be2f
diff --git a/application/Espo/Core/Utils/Database/Orm/RelationConverter.php b/application/Espo/Core/Utils/Database/Orm/RelationConverter.php
index b4b847e207..7834e665ac 100644
--- a/application/Espo/Core/Utils/Database/Orm/RelationConverter.php
+++ b/application/Espo/Core/Utils/Database/Orm/RelationConverter.php
@@ -59,7 +59,6 @@ class RelationConverter
RelationParam::ADDITIONAL_COLUMNS,
'noJoin',
RelationParam::INDEXES,
- RelationParam::CASCADE_REMOVAL,
];
/** @var string[] */
@@ -119,8 +118,14 @@ class RelationConverter
$raw = $convertedEntityDefs->toAssoc();
if (isset($raw[EntityParam::RELATIONS][$name])) {
- $this->mergeParams($raw[EntityParam::RELATIONS][$name], $params, $foreignParams ?? [], $linkType);
- $this->correct($raw[EntityParam::RELATIONS][$name]);
+ $defs = &$raw[EntityParam::RELATIONS][$name];
+
+ $this->mergeParams($defs, $params, $foreignParams ?? [], $linkType);
+ $this->correct($defs);
+
+ if ($params[RelationParam::CASCADE_REMOVAL] ?? false) {
+ $defs[RelationParam::CASCADE_REMOVAL] = true;
+ }
}
return [$entityType => $raw];