tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed saving of blank values to the has_one relations on versioned objects

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60830 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-08-15 03:08:03 +00:00
parent 72c9bdda5a
commit b92b2a5887
3 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/model/DataObject.php
View File

@ -650,9 +650,16 @@ class DataObject extends ViewableData implements DataObjectInterface {
$fieldObj = $this->obj($fieldName);
if(!isset($manipulation[$class])) $manipulation[$class] = array();
// if database column doesn't correlate to a DBField instance, set up a default Varchar DBField
// (used mainly for has_one/has_many)
if(!$fieldObj) $fieldObj = DBField::create('Varchar', $this->record[$fieldName], $fieldName);
// if database column doesn't correlate to a DBField instance...
if(!$fieldObj) {
// Set up a default Int field for relations
if(preg_match('/ID$/', $fieldName) && $this->has_one(substr($fieldName,0,-2))) {
$fieldObj = DBField::create('Int', $this->record[$fieldName], $fieldName);
// Otherwise set up a default Varchar field
} else {
$fieldObj = DBField::create('Varchar', $this->record[$fieldName], $fieldName);
}
}
// CompositeDBFields handle their own value storage; regular fields need to be
// re-populated from the database

48
tests/DataObjectTest.php
View File

@ -262,6 +262,32 @@ class DataObjectTest extends SapphireTest {
$this->assertNotEquals($keysA, $keysB);
}
function testWriteSavesToHasOneRelations() {
/* DataObject::write() should save to a has_one relationship if you set a field called (relname)ID */
$team = new DataObjectTest_Team();
$captainID = $this->idFromFixture('DataObjectTest_Player', 'player1');
$team->CaptainID = $captainID;
$team->write();
$this->assertEquals($captainID, DB::query("SELECT CaptainID FROM DataObjectTest_Team WHERE ID = $team->ID")->value());
/* After giving it a value, you should also be able to set it back to null */
$team->CaptainID = '';
$team->write();
$this->assertEquals(0, DB::query("SELECT CaptainID FROM DataObjectTest_Team WHERE ID = $team->ID")->value());
/* You should also be able to save a blank to it when it's first created */
$team = new DataObjectTest_Team();
$team->CaptainID = '';
$team->write();
$this->assertEquals(0, DB::query("SELECT CaptainID FROM DataObjectTest_Team WHERE ID = $team->ID")->value());
/* Ditto for existing records without a value */
$existingTeam = $this->objFromFixture('DataObjectTest_Team', 'team1');
$existingTeam->CaptainID = '';
$existingTeam->write();
$this->assertEquals(0, DB::query("SELECT CaptainID FROM DataObjectTest_Team WHERE ID = $existingTeam->ID")->value());
}
}
class DataObjectTest_Player extends Member implements TestOnly {
@ -273,15 +299,19 @@ class DataObjectTest_Player extends Member implements TestOnly {
}
class DataObjectTest_Team extends DataObject implements TestOnly {
static $db = array(
'Title' => 'Text',
);
static $many_many = array(
'Players' => 'DataObjectTest_Player'
);
static $db = array(
'Title' => 'Text',
);
static $has_one = array(
"Captain" => 'DataObjectTest_Player',
);
static $many_many = array(
'Players' => 'DataObjectTest_Player'
);
}
?>

14
tests/SiteTreeTest.php
View File

@ -104,6 +104,20 @@ class SiteTreeTest extends SapphireTest {
$this->assertContains('Products', $allChildren);
$this->assertNotContains('Staff', $allChildren);
}
function testCanSaveBlankToHasOneRelations() {
/* DataObject::write() should save to a has_one relationship if you set a field called (relname)ID */
$page = new SiteTree();
$parentID = $this->idFromFixture('Page', 'home');
$page->ParentID = $parentID;
$page->write();
$this->assertEquals($parentID, DB::query("SELECT ParentID FROM SiteTree WHERE ID = $page->ID")->value());
/* You should then be able to save a null/0/'' value to the relation */
$page->ParentID = null;
$page->write();
$this->assertEquals(0, DB::query("SELECT ParentID FROM SiteTree WHERE ID = $page->ID")->value());
}
}