RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

fixes bug with extended-non-Doctrine_Record tables and makes the relationship parser to fallback to the old method to find keys if it cannot be guessed

Browse Source
This commit is contained in:
runa 2007-06-07 19:20:24 +00:00
parent 42170dd406
commit 7a00232c7a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Doctrine/Relation/Parser.php
View File

@ -245,7 +245,11 @@ class Doctrine_Relation_Parser
$conn = $this->_table->getConnection();
foreach ($classes as $class) {
$table = $conn->getTable($class);
try {
$table = $conn->getTable($class);
} catch (Doctrine_Table_Exception $e) {
continue;
}
$columns = $this->getIdentifiers($table);
$found = true;
@ -299,7 +303,11 @@ class Doctrine_Relation_Parser
// try to guess the local key
if ($def['foreign'] === $def['table']->getIdentifier()) {
$def['localKey'] = true;
$def['local'] = $this->guessColumns($foreignClasses, $this->_table);
try {
$def['local'] = $this->guessColumns($foreignClasses, $this->_table);
} catch (Doctrine_Relation_Exception $e) {
$def['local'] = $this->_table->getIdentifier();
}
} else {
$def['local'] = $this->_table->getIdentifier();
}