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 #652 from silverstripe-rebelalliance/trac/7482

Browse Source 
BUG Fix issues with composite fields, as per Trac/7482
This commit is contained in:
Hamish Friedlander 2012-07-22 15:14:30 -07:00
commit 5fa18e9ab6
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
model/DataObject.php
View File

@ -679,13 +679,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return array The data as a map. * @return array The data as a map.
*/ */
public function toMap() { public function toMap() {
foreach ($this->record as $key => $value) { $this->loadLazyFields();
if (strlen($key) > 5 && substr($key, -5) == '_Lazy') {
$this->loadLazyFields($value);
break;
}
}
return $this->record; return $this->record;
} }
@ -847,13 +841,16 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* if they are not already marked as changed. * if they are not already marked as changed.
*/ */
public function forceChange() { public function forceChange() {
// Ensure lazy fields loaded
$this->loadLazyFields();
// $this->record might not contain the blank values so we loop on $this->inheritedDatabaseFields() as well // $this->record might not contain the blank values so we loop on $this->inheritedDatabaseFields() as well
$fieldNames = array_unique(array_merge(array_keys($this->record), array_keys($this->inheritedDatabaseFields()))); $fieldNames = array_unique(array_merge(array_keys($this->record), array_keys($this->inheritedDatabaseFields())));
foreach($fieldNames as $fieldName) { foreach($fieldNames as $fieldName) {
if(!isset($this->changed[$fieldName])) $this->changed[$fieldName] = 1; if(!isset($this->changed[$fieldName])) $this->changed[$fieldName] = 1;
// Populate the null values in record so that they actually get written // Populate the null values in record so that they actually get written
if(!$this->$fieldName) $this->record[$fieldName] = null; if(!isset($this->record[$fieldName])) $this->record[$fieldName] = null;
} }
// @todo Find better way to allow versioned to write a new version after forceChange // @todo Find better way to allow versioned to write a new version after forceChange
@ -1921,6 +1918,14 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$helper = $this->castingHelper($field); $helper = $this->castingHelper($field);
$fieldObj = Object::create_from_string($helper, $field); $fieldObj = Object::create_from_string($helper, $field);
$compositeFields = $fieldObj->compositeDatabaseFields();
foreach ($compositeFields as $compositeName => $compositeType) {
if(isset($this->record[$field.$compositeName.'_Lazy'])) {
$tableClass = $this->record[$field.$compositeName.'_Lazy'];
$this->loadLazyFields($tableClass);
}
}
// write value only if either the field value exists, // write value only if either the field value exists,
// or a valid record has been loaded from the database // or a valid record has been loaded from the database
$value = (isset($this->record[$field])) ? $this->record[$field] : null; $value = (isset($this->record[$field])) ? $this->record[$field] : null;
@ -1946,13 +1951,24 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
/** /**
* Loads all the stub fields than an initial lazy load didn't load fully. * Loads all the stub fields that an initial lazy load didn't load fully.
* *
* @param tableClass Base table to load the values from. Others are joined as required. * @param tableClass Base table to load the values from. Others are joined as required.
* Not specifying a tableClass will load all lazy fields from all tables.
*/ */
protected function loadLazyFields($tableClass = null) { protected function loadLazyFields($tableClass = null) {
// Smarter way to work out the tableClass? Should the functionality in toMap and getField be moved into here? if (!$tableClass) {
if (!$tableClass) $tableClass = $this->ClassName; $loaded = array();
foreach ($this->record as $key => $value) {
if (strlen($key) > 5 && substr($key, -5) == '_Lazy' && !array_key_exists($value, $loaded)) {
$this->loadLazyFields($value);
$loaded[$value] = $value;
}
}
return;
}
$dataQuery = new DataQuery($tableClass); $dataQuery = new DataQuery($tableClass);
@ -2092,9 +2108,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// If we've just lazy-loaded the column, then we need to populate the $original array by // If we've just lazy-loaded the column, then we need to populate the $original array by
// called getField(). Too much overhead? Could this be done by a quicker method? Maybe only // called getField(). Too much overhead? Could this be done by a quicker method? Maybe only
// on a call to getChanged()? // on a call to getChanged()?
if (isset($this->record[$fieldName.'_Lazy'])) { $this->getField($fieldName);
$this->getField($fieldName);
}
$this->record[$fieldName] = $val; $this->record[$fieldName] = $val;
// Situation 2: Passing a literal or non-DBField object // Situation 2: Passing a literal or non-DBField object
@ -2120,9 +2134,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// If we've just lazy-loaded the column, then we need to populate the $original array by // If we've just lazy-loaded the column, then we need to populate the $original array by
// called getField(). Too much overhead? Could this be done by a quicker method? Maybe only // called getField(). Too much overhead? Could this be done by a quicker method? Maybe only
// on a call to getChanged()? // on a call to getChanged()?
if (isset($this->record[$fieldName.'_Lazy'])) { $this->getField($fieldName);
$this->getField($fieldName);
}
// Value is always saved back when strict check succeeds. // Value is always saved back when strict check succeeds.
$this->record[$fieldName] = $val; $this->record[$fieldName] = $val;