Merge pull request #4071 from najdanovicivan/nosql/base-model-fix

Model/BaseModel - Fix primary key and add @throws for builder method
codeigniter4 · Jan 7, 2021 · e67d29f · e67d29f
2 parents c5adf56 + b01cb98
commit e67d29f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -1675,13 +1675,6 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
 		if (method_exists($data, 'toRawArray'))
 		{
 			$properties = $data->toRawArray($onlyChanged, $recursive);
-
-			// Always grab the primary key otherwise updates will fail.
-			if (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
-				&& ! empty($data->{$this->primaryKey}))
-			{
-				$properties[$this->primaryKey] = $data->{$this->primaryKey};
-			}
 		}
 		else
 		{

diff --git a/system/Model.php b/system/Model.php
@@ -560,6 +560,7 @@ public function countAllResults(bool $reset = true, bool $test = false)
 	 * @param string|null $table Table name
 	 *
 	 * @return BaseBuilder
+	 * @throws ModelException
 	 */
 	public function builder(?string $table = null)
 	{