Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-10 05:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug where relations were still used for depth parameter

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-11 10:52:05 +02:00
parent d2ab4feda0
commit e8b91fac09
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DataStorage/Database/DataMapperAbstract.php
View File

@ -1399,7 +1399,7 @@ class DataMapperAbstract implements DataMapperInterface
} }
if (isset(static::$ownsOne[$propertyName])) { if (isset(static::$ownsOne[$propertyName])) {
$id = self::updateOwnsOne($propertyName, $property->getValue($obj), self::$relations, $depth); $id = self::updateOwnsOne($propertyName, $property->getValue($obj), $depth);
$value = self::parseValue($column['type'], $id); $value = self::parseValue($column['type'], $id);
/** /**
@ -1410,7 +1410,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
$query->set([static::$table . '.' . $column['name'] => $value]); $query->set([static::$table . '.' . $column['name'] => $value]);
} elseif (isset(static::$belongsTo[$propertyName])) { } elseif (isset(static::$belongsTo[$propertyName])) {
$id = self::updateBelongsTo($propertyName, $property->getValue($obj), self::$relations, $depth); $id = self::updateBelongsTo($propertyName, $property->getValue($obj), $depth);
$value = self::parseValue($column['type'], $id); $value = self::parseValue($column['type'], $id);
/** /**
@ -1473,7 +1473,7 @@ class DataMapperAbstract implements DataMapperInterface
$property = ArrayUtils::getArray($column['internal'], $obj, '/'); $property = ArrayUtils::getArray($column['internal'], $obj, '/');
if (isset(static::$ownsOne[$path])) { if (isset(static::$ownsOne[$path])) {
$id = self::updateOwnsOneArray($column['internal'], $property, self::$relations, $depth); $id = self::updateOwnsOneArray($column['internal'], $property, $depth);
$value = self::parseValue($column['type'], $id); $value = self::parseValue($column['type'], $id);
/** /**
@ -1484,7 +1484,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
$query->set([static::$table . '.' . $column['name'] => $value]); $query->set([static::$table . '.' . $column['name'] => $value]);
} elseif (isset(static::$belongsTo[$path])) { } elseif (isset(static::$belongsTo[$path])) {
$id = self::updateBelongsToArray($column['internal'], $property, self::$relations, $depth); $id = self::updateBelongsToArray($column['internal'], $property, $depth);
$value = self::parseValue($column['type'], $id); $value = self::parseValue($column['type'], $id);
/** /**
@ -1530,17 +1530,18 @@ class DataMapperAbstract implements DataMapperInterface
return $objId; return $objId;
} }
self::addInitialized(static::class, $objId, $obj); self::addInitialized(static::class, $objId, $obj, $depth);
--$depth;
if ($relations === RelationType::ALL) { if ($relations === RelationType::ALL) {
self::updateHasMany($refClass, $obj, $objId, --$depth); self::updateHasMany($refClass, $obj, $objId, $depth);
} }
if (empty($objId)) { if (empty($objId)) {
return self::create($obj, self::$relations); return self::create($obj, self::$relations);
} }
self::updateModel($obj, $objId, $refClass, --$depth); self::updateModel($obj, $objId, $refClass, $depth);
self::clear(); self::clear();
@ -1573,7 +1574,8 @@ class DataMapperAbstract implements DataMapperInterface
return $objId; return $objId;
} }
self::addInitializedArray(static::class, $objId, $obj); self::addInitializedArray(static::class, $objId, $obj, $depth);
--$depth;
if (empty($objId)) { if (empty($objId)) {
$update = false; $update = false;
@ -1581,11 +1583,11 @@ class DataMapperAbstract implements DataMapperInterface
} }
if ($relations === RelationType::ALL) { if ($relations === RelationType::ALL) {
self::updateHasManyArray($obj, $objId, --$depth); self::updateHasManyArray($obj, $objId, $depth);
} }
if ($update) { if ($update) {
self::updateModelArray($obj, $objId, --$depth); self::updateModelArray($obj, $objId, $depth);
} }
self::clear(); self::clear();