From c0ded5607c70d32c457e3fe7a2c85837186dc2c8 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 23 Dec 2018 17:32:18 +0100
Subject: [PATCH] Allow creation of models with id

---
 DataStorage/Database/DataMapperAbstract.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index e6e396a2b..322d140cf 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -332,12 +332,13 @@ class DataMapperAbstract implements DataMapperInterface
      *
      * @param mixed $obj       Object reference (gets filled with insert id)
      * @param int   $relations Create all relations as well
+     * @param bool  $force     Force creation even if id is set in model
      *
      * @return mixed
      *
      * @since  1.0.0
      */
-    public static function create($obj, int $relations = RelationType::ALL)
+    public static function create($obj, int $relations = RelationType::ALL, bool $force = false)
     {
         self::extend(__CLASS__);
 
@@ -347,7 +348,8 @@ class DataMapperAbstract implements DataMapperInterface
 
         $refClass = new \ReflectionClass($obj);
 
-        if (!empty($id = self::getObjectId($obj, $refClass))) {
+        // todo: remove force and instead check if object is autoincrement. if not autoincrement then create even if id is set!!!
+        if (!empty($id = self::getObjectId($obj, $refClass)) && !$force) {
             $objId = $id;
         } else {
             $objId = self::createModel($obj, $refClass);
@@ -427,7 +429,7 @@ class DataMapperAbstract implements DataMapperInterface
                 $value = self::parseValue($column['type'], $id);
 
                 $query->insert($column['name'])->value($value);
-            } elseif ($column['name'] !== static::$primaryField) {
+            } elseif ($column['name'] !== static::$primaryField || !empty($property->getValue($obj))) {
                 $tValue = $property->getValue($obj);
                 if (\stripos($column['internal'], '/') !== false) {
                     $path = \explode('/', $column['internal']);