RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 07:36:03 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1667] Removed implicit obligation to define an Index and UniqueConstraint name. It is optional, but Annotations Driver was broken if not defined.

Browse Source
This commit is contained in:
Guilherme Blanco 2012-03-03 13:05:11 -05:00
parent 1447884fde
commit a47e566382
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -176,17 +176,25 @@ class AnnotationDriver implements Driver
if ($tableAnnot->indexes !== null) { if ($tableAnnot->indexes !== null) {
foreach ($tableAnnot->indexes as $indexAnnot) { foreach ($tableAnnot->indexes as $indexAnnot) {
$primaryTable['indexes'][$indexAnnot->name] = array( $index = array('columns' => $indexAnnot->columns);
'columns' => $indexAnnot->columns
); if ( ! empty($indexAnnot->name)) {
$primaryTable['indexes'][$indexAnnot->name] = $index;
} else {
$primaryTable['indexes'][] = $index;
}
} }
} }
if ($tableAnnot->uniqueConstraints !== null) { if ($tableAnnot->uniqueConstraints !== null) {
foreach ($tableAnnot->uniqueConstraints as $uniqueConstraint) { foreach ($tableAnnot->uniqueConstraints as $uniqueConstraintAnnot) {
$primaryTable['uniqueConstraints'][$uniqueConstraint->name] = array( $uniqueConstraint = array('columns' => $uniqueConstraintAnnot->columns);
'columns' => $uniqueConstraint->columns
); if ( ! empty($uniqueConstraintAnnot->name)) {
$primaryTable['uniqueConstraints'][$uniqueConstraintAnnot->name] = $uniqueConstraint;
} else {
$primaryTable['uniqueConstraints'][] = $uniqueConstraint;
}
} }
} }