Entity and Model corrections

codeigniter4 · Apr 13, 2019 · c015ef1 · c015ef1
1 parent 8fdb125
commit c015ef1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/system/Entity.php b/system/Entity.php
@@ -38,6 +38,7 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Exceptions\EntityException;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Exceptions\CastException;
 

diff --git a/system/Model.php b/system/Model.php
@@ -619,6 +619,11 @@ public function insert($data = null, bool $returnID = true)
 			$this->tempData = [];
 		}
 
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('insert');
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -668,11 +673,6 @@ public function insert($data = null, bool $returnID = true)
 
 		$data = $this->trigger('beforeInsert', ['data' => $data]);
 
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('insert');
-		}
-
 		// Must use the set() method to ensure objects get converted to arrays
 		$result = $this->builder()
 				->set($data['data'], '', $escape)
@@ -749,6 +749,11 @@ public function update($id = null, $data = null): bool
 			$this->tempData = [];
 		}
 
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('update');
+		}
+
 		// If $data is using a custom class with public or protected
 		// properties representing the table elements, we need to grab
 		// them as an array.
@@ -790,11 +795,6 @@ public function update($id = null, $data = null): bool
 
 		$data = $this->trigger('beforeUpdate', ['id' => $id, 'data' => $data]);
 
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('update');
-		}
-
 		$builder = $this->builder();
 
 		if ($id)