mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
removed doubled merge() method (caused by merging in branches/2.0-inform)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45543 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
df30647a88
commit
df0bed523c
@ -387,93 +387,6 @@ class DataObject extends Controller {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Merges data and relations from another object of same class,
|
||||
* without conflict resolution. Allows to specify which
|
||||
* dataset takes priority in case its not empty.
|
||||
* has_one-relations are just transferred with priority 'right'.
|
||||
* has_many and many_many-relations are added regardless of priority.
|
||||
*
|
||||
* Caution: has_many/many_many relations are moved rather than duplicated,
|
||||
* meaning they are not connected to the merged object any longer.
|
||||
* Caution: Just saves updated has_many/many_many relations to the database,
|
||||
* doesn't write the updated object itself (just writes the object-properties).
|
||||
* Caution: Does not delete the merged object.
|
||||
* Caution: Does now overwrite Created date on the original object.
|
||||
*
|
||||
* @param $obj DataObject
|
||||
* @param $priority String left|right Determines who wins in case of a conflict (optional)
|
||||
* @param $includeRelations Boolean Merge any existing relations (optional)
|
||||
* @param $overwriteWithEmpty Boolean Overwrite existing left values with empty right values.
|
||||
* Only applicable with $priority='right'. (optional)
|
||||
* @return Boolean
|
||||
*/
|
||||
public function merge($rightObj, $priority = 'right', $includeRelations = true, $overwriteWithEmpty = false) {
|
||||
$leftObj = $this;
|
||||
|
||||
if($leftObj->ClassName != $rightObj->ClassName) {
|
||||
// we can't merge similiar subclasses because they might have additional relations
|
||||
user_error("DataObject->merge(): Invalid object class '{$rightObj->ClassName}'
|
||||
(expected '{$leftObj->ClassName}').", E_USER_WARNING);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!$rightObj->ID) {
|
||||
user_error("DataObject->merge(): Please write your merged-in object to the database before merging,
|
||||
to make sure all relations are transferred properly.').", E_USER_WARNING);
|
||||
return false;
|
||||
}
|
||||
|
||||
// makes sure we don't merge data like ID or ClassName
|
||||
$leftData = $leftObj->customDatabaseFields();
|
||||
$rightData = $rightObj->customDatabaseFields();
|
||||
|
||||
foreach($rightData as $key=>$rightVal) {
|
||||
// don't merge conflicting values if priority is 'left'
|
||||
if($priority == 'left' && $leftObj->{$key} !== $rightObj->{$key}) continue;
|
||||
|
||||
// don't overwrite existing left values with empty right values (if $overwriteWithEmpty is set)
|
||||
if($priority == 'right' && !$overwriteWithEmpty && empty($rightObj->{$key})) continue;
|
||||
|
||||
// TODO remove redundant merge of has_one fields
|
||||
$leftObj->{$key} = $rightObj->{$key};
|
||||
}
|
||||
|
||||
// merge relations
|
||||
if($includeRelations) {
|
||||
if($manyMany = $this->many_many()) {
|
||||
foreach($manyMany as $relationship => $class) {
|
||||
$leftComponents = $leftObj->getManyManyComponents($relationship);
|
||||
$rightComponents = $rightObj->getManyManyComponents($relationship);
|
||||
if($rightComponents && $rightComponents->exists()) $leftComponents->addMany($rightComponents->column('ID'));
|
||||
$leftComponents->write();
|
||||
}
|
||||
}
|
||||
|
||||
if($hasMany = $this->has_many()) {
|
||||
foreach($hasMany as $relationship => $class) {
|
||||
$leftComponents = $leftObj->getComponents($relationship);
|
||||
$rightComponents = $rightObj->getComponents($relationship);
|
||||
if($rightComponents && $rightComponents->exists()) $leftComponents->addMany($rightComponents->column('ID'));
|
||||
$leftComponents->write();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($hasOne = $this->has_one()) {
|
||||
foreach($hasOne as $relationship => $class) {
|
||||
$leftComponent = $leftObj->getComponent($relationship);
|
||||
$rightComponent = $rightObj->getComponent($relationship);
|
||||
if($leftComponent->exists() && $rightComponent->exists() && $priority == 'right') {
|
||||
$leftObj->{$relationship . 'ID'} = $rightObj->{$relationship . 'ID'};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Forces the record to think that all its data has changed.
|
||||
* Doesn't write to the database.
|
||||
|
Loading…
x
Reference in New Issue
Block a user