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

Merge pull request #2197 from hafriedlander/fix/dbapichange

Browse Source 
FIX Recent patch to DataObject#db changed API which broke core
This commit is contained in:
Ingo Schommer 2013-07-04 15:20:52 -07:00
commit c3e9e44204
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
model/DataObject.php
View File

@ -1661,16 +1661,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/** /**
* Return all of the database fields defined in self::$db and all the parent classes. * Return all of the database fields defined in self::$db and all the parent classes.
* Doesn't include any fields specified by self::$has_one. Use $this->has_one() to get these fields * Doesn't include any fields specified by self::$has_one. Use $this->has_one() to get these fields
* Also returns "base" fields like "Created", "LastEdited", et cetera.
* *
* @param string $fieldName Limit the output to a specific field name * @param string $fieldName Limit the output to a specific field name
* @return array The database fields * @return array The database fields
*/ */
public function db($fieldName = null) { public function db($fieldName = null) {
if ($fieldName && array_key_exists($fieldName, self::$fixed_fields)) {
return self::$fixed_fields[$fieldName];
}
$classes = ClassInfo::ancestry($this); $classes = ClassInfo::ancestry($this);
$good = false; $good = false;
$items = array(); $items = array();
@ -1709,10 +1704,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
} }
if (!$fieldName) {
// trying to get all fields, so add the fixed fields to return value
$items = array_merge(self::$fixed_fields, $items);
}
return $items; return $items;
} }
@ -2675,6 +2666,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$val = get_class($this); $val = get_class($this);
return DBField::create_field('Varchar', $val, $fieldName, $this); return DBField::create_field('Varchar', $val, $fieldName, $this);
} else if(array_key_exists($fieldName, self::$fixed_fields)) {
return DBField::create_field(self::$fixed_fields[$fieldName], $this->$fieldName, $fieldName, $this);
// General casting information for items in $db // General casting information for items in $db
} else if($helper = $this->db($fieldName)) { } else if($helper = $this->db($fieldName)) {
$obj = Object::create_from_string($helper, $fieldName); $obj = Object::create_from_string($helper, $fieldName);

11
tests/model/DataObjectTest.php
View File

@ -19,6 +19,17 @@ class DataObjectTest extends SapphireTest {
'DataObjectTest_TeamComment' 'DataObjectTest_TeamComment'
); );
public function testBaseFieldsExcludedFromDb() {
$obj = new DataObjectTest_ValidatedObject();
$dbFields = $obj->db();
$this->assertArrayHasKey('Name', $dbFields);
$this->assertArrayNotHasKey('Created', $dbFields);
$this->assertArrayNotHasKey('LastEdited', $dbFields);
$this->assertArrayNotHasKey('ClassName', $dbFields);
$this->assertArrayNotHasKey('ID', $dbFields);
}
public function testValidObjectsForBaseFields() { public function testValidObjectsForBaseFields() {
$obj = new DataObjectTest_ValidatedObject(); $obj = new DataObjectTest_ValidatedObject();