[relationships] fixed working with empty hasOne relationship

nextras · Sep 15, 2014 · 824fd7a · 824fd7a
1 parent 6e3f54e
commit 824fd7a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Relationships/HasOne.php b/src/Relationships/HasOne.php
@@ -116,7 +116,7 @@ public function set($value, $forceNULL = FALSE)
 	public function getEntity($collectionName = NULL)
 	{
 		if ($this->value === FALSE) {
-			if (!$this->parent->isPersisted()) {
+			if (!$this->parent->isPersisted() || $this->primaryValue === NULL) {
 				return NULL;
 			}
 

diff --git a/tests/cases/integration/NetteDatabase/relationships.manyHasOne.phpt b/tests/cases/integration/NetteDatabase/relationships.manyHasOne.phpt
@@ -46,6 +46,17 @@ class RelationshipManyHasOneTest extends DatabaseTestCase
 		Assert::same([1, 1, 2, 2], $authors);
 	}
 
+
+	public function testEmpty()
+	{
+		/** @var Book $book */
+		$book = $this->orm->books->getById(2);
+		Assert::null($book->translator);
+
+		$book = new Book();
+		Assert::null($book->translator);
+	}
+
 }