From cf5d524235b82c3f13a0643333ffcd140788da14 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 28 Mar 2014 09:37:04 +1300
Subject: [PATCH] BUG Fix regressions from #2206 in hasValue and dbObject

Fixes #2982
---
 model/DataObject.php           |  8 ++++----
 tests/model/DataObjectTest.php | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/model/DataObject.php b/model/DataObject.php
index 334dbf6a3..b19e49b7c 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -2788,8 +2788,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
 			return DBField::create_field('ForeignKey', $val, $fieldName, $this);
 			
 		// has_one for polymorphic relations do not end in ID
-		} else if($this->has_one($fieldName)) {
-			$val = $this->$fieldName;
+		} else if(($type = $this->has_one($fieldName)) && ($type === 'DataObject')) {
+			$val = $this->$fieldName();
 			return DBField::create_field('PolymorphicForeignKey', $val, $fieldName, $this);
 
 		}
@@ -3784,8 +3784,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
 	 * @return boolean
 	 */
 	public function hasValue($field, $arguments = null, $cache = true) {
-		$obj = $this->dbObject($field);
-		if($obj) {
+		// has_one fields should not use dbObject to check if a value is given
+		if(!$this->has_one($field) && ($obj = $this->dbObject($field))) {
 			return $obj->exists();
 		} else {
 			return parent::hasValue($field, $arguments, $cache);
diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php
index bb469f062..ccfe3bead 100644
--- a/tests/model/DataObjectTest.php
+++ b/tests/model/DataObjectTest.php
@@ -228,6 +228,7 @@ class DataObjectTest extends SapphireTest {
 		
 		// Check entity with polymorphic has-one
 		$fan1 = $this->objFromFixture("DataObjectTest_Fan", "fan1");
+		$this->assertTrue((bool)$fan1->hasValue('Favourite'));
 		
 		// There will be fields named (relname)ID and (relname)Class for polymorphic
 		// entities
@@ -238,6 +239,13 @@ class DataObjectTest extends SapphireTest {
 		$favourite = $fan1->Favourite();
 		$this->assertEquals($team1ID, $favourite->ID);
 		$this->assertInstanceOf('DataObjectTest_Team', $favourite);
+		
+		// check behaviour of dbObject with polymorphic relations
+		$favouriteDBObject = $fan1->dbObject('Favourite');
+		$favouriteValue = $favouriteDBObject->getValue();
+		$this->assertInstanceOf('PolymorphicForeignKey', $favouriteDBObject);
+		$this->assertEquals($favourite->ID, $favouriteValue->ID);
+		$this->assertEquals($favourite->ClassName, $favouriteValue->ClassName);
 	}
 	
 	/**
@@ -388,10 +396,17 @@ class DataObjectTest extends SapphireTest {
 		$team1 = $this->objFromFixture('DataObjectTest_Team', 'team1');
 		$player1 = $this->objFromFixture('DataObjectTest_Player', 'player1');
 		$fan1 = $this->objFromFixture('DataObjectTest_Fan', 'fan1');
+		
+		// Test relation probing
+		$this->assertFalse((bool)$team1->hasValue('Captain', null, false));
+		$this->assertFalse((bool)$team1->hasValue('CaptainID', null, false));
 
 		// Add a captain to team 1
 		$team1->setField('CaptainID', $player1->ID);
 		$team1->write();
+		
+		$this->assertTrue((bool)$team1->hasValue('Captain', null, false));
+		$this->assertTrue((bool)$team1->hasValue('CaptainID', null, false));
 
 		$this->assertEquals($player1->ID, $team1->Captain()->ID,
 			'The captain exists for team 1');