Fixes #618
This commit is contained in:
parent
391cdfab01
commit
84a97f98ed
@ -212,24 +212,7 @@ class Doctrine_Import_Schema
|
|||||||
*/
|
*/
|
||||||
public function getRelations($properties)
|
public function getRelations($properties)
|
||||||
{
|
{
|
||||||
$all_relations = isset($this->_relations[$properties['className']]) ? $this->_relations[$properties['className']]:array();
|
return isset($this->_relations[$properties['className']]) ? $this->_relations[$properties['className']]:array();
|
||||||
|
|
||||||
// This is for checking for duplicates between alias-relations and a auto-generated relations to ensure the result set of unique relations
|
|
||||||
$exist_relations = array();
|
|
||||||
$unique_relations = array();
|
|
||||||
foreach ($all_relations as $relation) {
|
|
||||||
if (!in_array($relation['class'], $exist_relations)) {
|
|
||||||
$exist_relations[] = $relation['class'];
|
|
||||||
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
|
||||||
} else {
|
|
||||||
// check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it
|
|
||||||
if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) {
|
|
||||||
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $unique_relations;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user