Skip to content

EspoCRM – Open Source CRM Application

ref

Yuri Kuznetsovf4889f3f5c3a
diff --git a/application/Espo/ORM/Mapper/BaseMapper.php b/application/Espo/ORM/Mapper/BaseMapper.php
index 661abc2414..5950fcb3ae 100644
--- a/application/Espo/ORM/Mapper/BaseMapper.php
+++ b/application/Espo/ORM/Mapper/BaseMapper.php
@@ -1049,18 +1049,20 @@ class BaseMapper implements RDBMapper
$sth = $this->queryExecutor->execute($selectQuery);
+ $update = [
+ self::ATTR_DELETED => false,
+ ...$data,
+ ];
+
// @todo Leave one INSERT for better performance.
if ($sth->rowCount() === 0) {
$values = $where;
$columns = array_keys($values);
- $update = [self::ATTR_DELETED => false];
-
foreach ($data as $column => $value) {
$columns[] = $column;
$values[$column] = $value;
- $update[$column] = $value;
}
$insertQuery = InsertBuilder::create()
@@ -1070,17 +1072,11 @@ class BaseMapper implements RDBMapper
->updateSet($update)
->build();
- $sth = $this->queryExecutor->execute($insertQuery);
+ $this->queryExecutor->execute($insertQuery);
return true;
}
- $update = [self::ATTR_DELETED => false];
-
- foreach ($data as $column => $value) {
- $update[$column] = $value;
- }
-
$updateQuery = UpdateBuilder::create()
->in($middleName)
->where($where)