Merge pull request codeigniter4#7760 from kenjis/refactor-model-inser…

…t-noAutoIncrement refactor: remove Model::$tempPrimaryKeyValue
datamweb · Aug 6, 2023 · eaa8f1a · eaa8f1a
2 parents 76c7d7e + b9dd62d
commit eaa8f1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -760,7 +760,7 @@ public function insert($data = null, bool $returnID = true)
 
         // Must be called first, so we don't
         // strip out created_at values.
-        $data = $this->doProtectFields($data);
+        $data = $this->doProtectFieldsForInsert($data);
 
         // doProtectFields() can further remove elements from
         // $data so we need to check for empty dataset again

diff --git a/system/Model.php b/system/Model.php
@@ -129,13 +129,6 @@ class Model extends BaseModel
      */
     protected $escape = [];
 
-    /**
-     * Primary Key value when inserting and useAutoIncrement is false.
-     *
-     * @var int|string|null
-     */
-    private $tempPrimaryKeyValue;
-
     /**
      * Builder method names that should not be used in the Model.
      *
@@ -281,13 +274,6 @@ protected function doInsert(array $data)
         $escape       = $this->escape;
         $this->escape = [];
 
-        // If $useAutoIncrement is false, add the primary key data.
-        if ($this->useAutoIncrement === false && $this->tempPrimaryKeyValue !== null) {
-            $data[$this->primaryKey] = $this->tempPrimaryKeyValue;
-
-            $this->tempPrimaryKeyValue = null;
-        }
-
         // Require non-empty primaryKey when
         // not using auto-increment feature
         if (! $this->useAutoIncrement && empty($data[$this->primaryKey])) {
@@ -720,14 +706,6 @@ public function insert($data = null, bool $returnID = true)
             }
         }
 
-        if ($this->useAutoIncrement === false) {
-            if (is_array($data) && isset($data[$this->primaryKey])) {
-                $this->tempPrimaryKeyValue = $data[$this->primaryKey];
-            } elseif (is_object($data) && isset($data->{$this->primaryKey})) {
-                $this->tempPrimaryKeyValue = $data->{$this->primaryKey};
-            }
-        }
-
         $this->escape   = $this->tempData['escape'] ?? [];
         $this->tempData = [];