Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-09 21:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-12-16 11:22:27 +01:00
parent 857970c230
commit 4ed4caf55b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DataStorage/Database/DataMapperAbstract.php
View File

@ -1386,19 +1386,16 @@ class DataMapperAbstract implements DataMapperInterface
self::addInitialized(static::class, $objId, $obj); self::addInitialized(static::class, $objId, $obj);
if (empty($objId)) {
$update = false;
self::create($obj, $relations);
}
if ($relations === RelationType::ALL) { if ($relations === RelationType::ALL) {
self::updateHasMany($refClass, $obj, $objId, --$depth); self::updateHasMany($refClass, $obj, $objId, --$depth);
} }
if ($update) { if (empty($objId)) {
self::updateModel($obj, $objId, $refClass, --$depth); return self::create($obj, $relations);
} }
self::updateModel($obj, $objId, $refClass, --$depth);
return $objId; return $objId;
} }

2
DataStorage/Database/Query/Grammar/Grammar.php
View File

@ -316,6 +316,8 @@ class Grammar extends GrammarAbstract
return \rtrim(\rtrim(\number_format($value, 5, '.', ''), '0'), '.'); return \rtrim(\rtrim(\number_format($value, 5, '.', ''), '0'), '.');
} elseif ($value instanceof Column) { } elseif ($value instanceof Column) {
return $this->compileSystem($value->getColumn(), $prefix); return $this->compileSystem($value->getColumn(), $prefix);
} elseif ($value instanceof Builder) {
return '(' . \rtrim($value->toSql(), ';') . ')';
} else { } else {
throw new \InvalidArgumentException(\gettype($value)); throw new \InvalidArgumentException(\gettype($value));
} }