Implemented save for hasOne

cakephp · Nov 23, 2013 · abc1b4e · abc1b4e
1 parent dbeee9d
commit abc1b4e
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 1 deletion.
diff --git a/Cake/ORM/Association/BelongsTo.php b/Cake/ORM/Association/BelongsTo.php
@@ -110,7 +110,7 @@ public function save(Entity $entity, $options = []) {
 		if (!$targetEntity) {
 			return $entity;
 		}
-		
+
 		$table = $this->target();
 		$targetEntity = $table->save($targetEntity, $options);
 		if (!$targetEntity) {

diff --git a/Cake/ORM/Association/HasOne.php b/Cake/ORM/Association/HasOne.php
@@ -103,6 +103,22 @@ public function isOwningSide() {
  * @see Table::save()
  */
 	public function save(Entity $entity, $options = []) {
+		$targetEntity = $entity->get($this->property());
+		if (!$targetEntity) {
+			return $entity;
+		}
+
+		$properties = array_combine(
+			(array)$this->foreignKey(),
+			$entity->extract((array)$this->source()->primaryKey())
+		);
+		$targetEntity->set($properties);
+
+		if (!$this->target()->save($targetEntity, $options)) {
+			$targetEntity->unsetProperty(array_keys($properties));
+			return false;
+		}
+
 		return $entity;
 	}
 

diff --git a/Cake/Test/TestCase/ORM/TableTest.php b/Cake/Test/TestCase/ORM/TableTest.php
@@ -1994,4 +1994,60 @@ public function testsSaveBelongsToWithValidationError() {
 		$this->assertNotEmpty($entity->author->errors('name'));
 	}
 
+/**
+ * Tests saving hasOne association
+ *
+ * @group save
+ * @return void
+ */
+	public function testSaveHasOne() {
+		$entity = new \Cake\ORM\Entity([
+			'name' => 'Jose'
+		]);
+		$entity->article = new \Cake\ORM\Entity([
+			'title' => 'A Title',
+			'body' => 'A body'
+		]);
+
+		$table = TableRegistry::get('authors');
+		$table->hasOne('articles');
+		$this->assertSame($entity, $table->save($entity));
+		$this->assertFalse($entity->isNew());
+		$this->assertFalse($entity->article->isNew());
+		$this->assertEquals(4, $entity->article->id);
+		$this->assertEquals(5, $entity->article->get('author_id'));
+		$this->assertFalse($entity->article->dirty('author_id'));
+	}
+
+/**
+ * Tests saving hasOne association and returning a validation error will
+ * abort the saving process
+ *
+ * @group save
+ * @return void
+ */
+	public function testSaveHasOneWithValidationError() {
+		$entity = new \Cake\ORM\Entity([
+			'name' => 'Jose'
+		]);
+		$entity->article = new \Cake\ORM\Entity([
+			'title' => 'A Title',
+			'body' => 'A body'
+		]);
+
+		$table = TableRegistry::get('authors');
+		$table->hasOne('articles');
+		$table->association('articles')
+			->target()
+			->validator()
+			->add('title', 'num', ['rule' => 'numeric']);
+		$this->assertFalse($table->save($entity));
+		$this->assertFalse($entity->isNew());
+		$this->assertTrue($entity->article->isNew());
+		$this->assertNull($entity->article->id);
+		$this->assertNull($entity->article->get('author_id'));
+		$this->assertTrue($entity->article->dirty('author_id'));
+		$this->assertNotEMpty($entity->article->errors('title'));
+	}
+
 }