Commit 9c32fef9 authored by Jonathan.Wage's avatar Jonathan.Wage

Changed foreign_alias to foreignAlias

parent e22ad5ba
...@@ -142,7 +142,7 @@ class Doctrine_Import_Schema ...@@ -142,7 +142,7 @@ class Doctrine_Import_Schema
$class = isset($relation['class']) ? $relation['class']:$alias; $class = isset($relation['class']) ? $relation['class']:$alias;
$relation['foreign'] = isset($relation['foreign'])?$relation['foreign']:'id'; $relation['foreign'] = isset($relation['foreign'])?$relation['foreign']:'id';
$relation['foreign_alias'] = isset($relation['alias'])?$relation['alias']:null; $relation['foreignAlias'] = isset($relation['alias'])?$relation['alias']:null;
$relation['alias'] = $alias; $relation['alias'] = $alias;
$relation['class'] = $class; $relation['class'] = $class;
...@@ -164,7 +164,7 @@ class Doctrine_Import_Schema ...@@ -164,7 +164,7 @@ class Doctrine_Import_Schema
$newRelation['foreign'] = $relation['local']; $newRelation['foreign'] = $relation['local'];
$newRelation['local'] = $relation['foreign']; $newRelation['local'] = $relation['foreign'];
$newRelation['class'] = $className; $newRelation['class'] = $className;
$newRelation['alias'] = isset($relation['foreign_alias'])?$relation['foreign_alias']:$className; $newRelation['alias'] = isset($relation['foreignAlias'])?$relation['foreignAlias']:$className;
$newRelation['type'] = $relation['type'] === Doctrine_Relation::ONE ? Doctrine_Relation::MANY:Doctrine_Relation::ONE; $newRelation['type'] = $relation['type'] === Doctrine_Relation::ONE ? Doctrine_Relation::MANY:Doctrine_Relation::ONE;
$this->relations[$relation['class']][$className] = $newRelation; $this->relations[$relation['class']][$className] = $newRelation;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment