Fixed a bug related with dataToDatabase

oscarotero · Feb 20, 2014 · 93c3dfc · 93c3dfc
1 parent 167b355
commit 93c3dfc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/SimpleCrud/Row.php b/SimpleCrud/Row.php
@@ -9,7 +9,7 @@
 use SimpleCrud\Entity;
 
 class Row implements HasEntityInterface, \JsonSerializable {
-	private $values;
+	private $values = [];
 	private $changes = [];
 
 	public $entity;
@@ -19,11 +19,15 @@ public function __construct (Entity $entity, array $data = null, $onlyDeclaredFi
 		$this->entity = $entity;
 		$this->manager = $entity->manager;
 
-		if ($onlyDeclaredFields === true) {
-			$data = array_intersect_key($data, $this->entity->getFieldsNames());
+		if ($data) {
+			if ($onlyDeclaredFields === true) {
+				$data = array_intersect_key($data, $this->entity->getFieldsNames());
+			}
+
+			$this->values = $data;
 		}
 
-		$this->values = ($data ?: array()) + $entity->getDefaults();
+		$this->values += $entity->getDefaults();
 	}
 
 

diff --git a/tests/SimpleCrudTest.php b/tests/SimpleCrudTest.php
@@ -216,6 +216,10 @@ public function testDataToDatabase () {
 
 		$row->set(['field1' => 'bye'])->save();
 		$this->assertSame($row->field1, $row->field2);
+
+		//Empty value
+		$row = $db->testing->create()->save();
+		$this->assertSame($row->field1, $row->field2);
 	}
 
 	public function testDatetimeFields () {