RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 22:53:15 +03:00
Code Issues Projects Releases Wiki Activity

Fix for class/alias relation generation.

Browse Source
This commit is contained in:
Jonathan.Wage 2007-10-05 19:10:32 +00:00
parent 3b0f749a58
commit 5bec1b2224
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/Import/Builder.php
View File

@ -208,7 +208,8 @@ END;
} }
foreach ($relations as $name => $relation) { foreach ($relations as $name => $relation) {
$alias = (isset($relation['alias']) && $relation['alias'] !== $name) ? ' as ' . $relation['alias'] : ''; $class = isset($relation['class']) ? $relation['class']:$name;
$alias = (isset($relation['alias']) && $relation['alias'] !== $relation['class']) ? ' as ' . $relation['alias'] : '';
if ( ! isset($relation['type'])) { if ( ! isset($relation['type'])) {
$relation['type'] = Doctrine_Relation::ONE; $relation['type'] = Doctrine_Relation::ONE;
@ -216,9 +217,9 @@ END;
if ($relation['type'] === Doctrine_Relation::ONE || if ($relation['type'] === Doctrine_Relation::ONE ||
$relation['type'] === Doctrine_Relation::ONE_COMPOSITE) { $relation['type'] === Doctrine_Relation::ONE_COMPOSITE) {
$ret[$i] = ' $this->hasOne(\'' . $name . $alias . '\''; $ret[$i] = ' $this->hasOne(\'' . $class . $alias . '\'';
} else { } else {
$ret[$i] = ' $this->hasMany(\'' . $name . $alias . '\''; $ret[$i] = ' $this->hasMany(\'' . $class . $alias . '\'';
} }
$a = array(); $a = array();