mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-29 20:59:23 +02:00
#1921 - Make DataObject::write() call the recursive write on components, even when the dataobject itself hasn't changed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49180 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee
parent
7917df81ed
commit
eda6a3b7e4
@ -530,93 +530,96 @@ class DataObject extends Controller implements DataObjectInterface {
|
||||
}
|
||||
|
||||
// No changes made
|
||||
if(!$this->changed) {
|
||||
return $this->record['ID'];
|
||||
}
|
||||
|
||||
foreach($this->getClassAncestry() as $ancestor) {
|
||||
if(ClassInfo::hasTable($ancestor))
|
||||
$ancestry[] = $ancestor;
|
||||
}
|
||||
|
||||
// Look for some changes to make
|
||||
unset($this->changed['ID']);
|
||||
|
||||
$hasChanges = false;
|
||||
foreach($this->changed as $fieldName => $changed) {
|
||||
if($changed) {
|
||||
$hasChanges = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if($hasChanges || $forceWrite || !$this->record['ID']) {
|
||||
|
||||
// New records have their insert into the base data table done first, so that they can pass the
|
||||
// generated primary key on to the rest of the manipulation
|
||||
if(!$this->record['ID'] && isset($ancestry[0])) {
|
||||
$baseTable = $ancestry[0];
|
||||
|
||||
DB::query("INSERT INTO `{$baseTable}` SET Created = NOW()");
|
||||
$this->record['ID'] = DB::getGeneratedID($baseTable);
|
||||
$this->changed['ID'] = 2;
|
||||
|
||||
$isNewRecord = true;
|
||||
if($this->changed) {
|
||||
foreach($this->getClassAncestry() as $ancestor) {
|
||||
if(ClassInfo::hasTable($ancestor))
|
||||
$ancestry[] = $ancestor;
|
||||
}
|
||||
|
||||
// Divvy up field saving into a number of database manipulations
|
||||
if(isset($ancestry) && is_array($ancestry)) {
|
||||
foreach($ancestry as $idx => $class) {
|
||||
$classSingleton = singleton($class);
|
||||
foreach($this->record as $fieldName => $value) {
|
||||
if(isset($this->changed[$fieldName]) && $this->changed[$fieldName] && $fieldType = $classSingleton->fieldExists($fieldName)) {
|
||||
$manipulation[$class]['fields'][$fieldName] = $value ? ("'" . addslashes($value) . "'") : singleton($fieldType)->nullValue();
|
||||
}
|
||||
}
|
||||
// Look for some changes to make
|
||||
unset($this->changed['ID']);
|
||||
|
||||
// Add the class name to the base object
|
||||
if($idx == 0) {
|
||||
$manipulation[$class]['fields']["LastEdited"] = "now()";
|
||||
if($dbCommand == 'insert') {
|
||||
$manipulation[$class]['fields']["Created"] = "now()";
|
||||
//echo "<li>$this->class - " .get_class($this);
|
||||
$manipulation[$class]['fields']["ClassName"] = "'$this->class'";
|
||||
}
|
||||
}
|
||||
|
||||
// In cases where there are no fields, this 'stub' will get picked up on
|
||||
if(ClassInfo::hasTable($class)) {
|
||||
$manipulation[$class]['command'] = $dbCommand;
|
||||
$manipulation[$class]['id'] = $this->record['ID'];
|
||||
} else {
|
||||
unset($manipulation[$class]);
|
||||
}
|
||||
$hasChanges = false;
|
||||
foreach($this->changed as $fieldName => $changed) {
|
||||
if($changed) {
|
||||
$hasChanges = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if($hasChanges || $forceWrite || !$this->record['ID']) {
|
||||
|
||||
// New records have their insert into the base data table done first, so that they can pass the
|
||||
// generated primary key on to the rest of the manipulation
|
||||
if(!$this->record['ID'] && isset($ancestry[0])) {
|
||||
$baseTable = $ancestry[0];
|
||||
|
||||
$this->extend('augmentWrite', $manipulation);
|
||||
// New records have their insert into the base data table done first, so that they can pass the
|
||||
// generated ID on to the rest of the manipulation
|
||||
if(isset($isNewRecord) && $isNewRecord && isset($manipulation[$baseTable])) {
|
||||
$manipulation[$baseTable]['command'] = 'update';
|
||||
}
|
||||
DB::manipulate($manipulation);
|
||||
DB::query("INSERT INTO `{$baseTable}` SET Created = NOW()");
|
||||
$this->record['ID'] = DB::getGeneratedID($baseTable);
|
||||
$this->changed['ID'] = 2;
|
||||
|
||||
if(isset($isNewRecord) && $isNewRecord) {
|
||||
DataObjectLog::addedObject($this);
|
||||
} else {
|
||||
DataObjectLog::changedObject($this);
|
||||
$isNewRecord = true;
|
||||
}
|
||||
|
||||
// Divvy up field saving into a number of database manipulations
|
||||
if(isset($ancestry) && is_array($ancestry)) {
|
||||
foreach($ancestry as $idx => $class) {
|
||||
$classSingleton = singleton($class);
|
||||
foreach($this->record as $fieldName => $value) {
|
||||
if(isset($this->changed[$fieldName]) && $this->changed[$fieldName] && $fieldType = $classSingleton->fieldExists($fieldName)) {
|
||||
$manipulation[$class]['fields'][$fieldName] = $value ? ("'" . addslashes($value) . "'") : singleton($fieldType)->nullValue();
|
||||
}
|
||||
}
|
||||
|
||||
// Add the class name to the base object
|
||||
if($idx == 0) {
|
||||
$manipulation[$class]['fields']["LastEdited"] = "now()";
|
||||
if($dbCommand == 'insert') {
|
||||
$manipulation[$class]['fields']["Created"] = "now()";
|
||||
//echo "<li>$this->class - " .get_class($this);
|
||||
$manipulation[$class]['fields']["ClassName"] = "'$this->class'";
|
||||
}
|
||||
}
|
||||
|
||||
// In cases where there are no fields, this 'stub' will get picked up on
|
||||
if(ClassInfo::hasTable($class)) {
|
||||
$manipulation[$class]['command'] = $dbCommand;
|
||||
$manipulation[$class]['id'] = $this->record['ID'];
|
||||
} else {
|
||||
unset($manipulation[$class]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$this->extend('augmentWrite', $manipulation);
|
||||
// New records have their insert into the base data table done first, so that they can pass the
|
||||
// generated ID on to the rest of the manipulation
|
||||
if(isset($isNewRecord) && $isNewRecord && isset($manipulation[$baseTable])) {
|
||||
$manipulation[$baseTable]['command'] = 'update';
|
||||
}
|
||||
DB::manipulate($manipulation);
|
||||
|
||||
if(isset($isNewRecord) && $isNewRecord) {
|
||||
DataObjectLog::addedObject($this);
|
||||
} else {
|
||||
DataObjectLog::changedObject($this);
|
||||
}
|
||||
|
||||
$this->changed = null;
|
||||
} elseif ( $showDebug ) {
|
||||
echo "<b>Debug:</b> no changes for DataObject<br />";
|
||||
}
|
||||
|
||||
$this->changed = null;
|
||||
} elseif ( $showDebug ) {
|
||||
echo "<b>Debug:</b> no changes for DataObject<br />";
|
||||
// Clears the cache for this object so get_one returns the correct object.
|
||||
$this->flushCache();
|
||||
|
||||
if(!isset($this->record['Created'])) {
|
||||
$this->record['Created'] = date('Y-m-d H:i:s');
|
||||
}
|
||||
$this->record['LastEdited'] = date('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
// Clears the cache for this object so get_one returns the correct object.
|
||||
$this->flushCache();
|
||||
|
||||
// Write ComponentSets as necessary
|
||||
if($this->components) {
|
||||
foreach($this->components as $component) {
|
||||
@ -624,11 +627,6 @@ class DataObject extends Controller implements DataObjectInterface {
|
||||
}
|
||||
}
|
||||
|
||||
if(!isset($this->record['Created'])) {
|
||||
$this->record['Created'] = date('Y-m-d H:i:s');
|
||||
}
|
||||
$this->record['LastEdited'] = date('Y-m-d H:i:s');
|
||||
|
||||
return $this->record['ID'];
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user