RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Convention fixes

Browse source
This commit is contained in:
Rivaros 2012-02-13 15:05:28 +02:00 • committed by Benjamin Eberlei
parent 06eed4cfda
commit df82b6060b
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -1224,8 +1224,9 @@ class ClassMetadataInfo implements ClassMetadata
foreach ($mapping['joinColumns'] as $key => &$joinColumn) { foreach ($mapping['joinColumns'] as $key => &$joinColumn) {
if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) { if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) {
if (count($mapping['joinColumns']) == 1) { if (count($mapping['joinColumns']) == 1) {
if(! isset($mapping['id']) || ! $mapping['id']) if (! isset($mapping['id']) || ! $mapping['id']) {
$joinColumn['unique'] = true; $joinColumn['unique'] = true;
}
} else { } else {
$uniqueContraintColumns[] = $joinColumn['name']; $uniqueContraintColumns[] = $joinColumn['name'];
} }

17
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View file

@ -300,10 +300,9 @@ class DatabaseDriver implements Driver
$associationMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $localColumn, true); $associationMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $localColumn, true);
$associationMapping['targetEntity'] = $this->getClassNameForTable($foreignTable); $associationMapping['targetEntity'] = $this->getClassNameForTable($foreignTable);
if ($primaryKeyColumns && in_array($localColumn, $primaryKeyColumns)) if ($primaryKeyColumns && in_array($localColumn, $primaryKeyColumns)) {
{ $associationMapping['id'] = true;
$associationMapping['id'] = true; }
}
for ($i = 0; $i < count($cols); $i++) { for ($i = 0; $i < count($cols); $i++) {
$associationMapping['joinColumns'][] = array( $associationMapping['joinColumns'][] = array(
@ -312,15 +311,13 @@ class DatabaseDriver implements Driver
); );
} }
//Here we need to check if $cols are the same as $primaryKeyColums //Here we need to check if $cols are the same as $primaryKeyColums
if(!array_diff($cols,$primaryKeyColumns)) if(!array_diff($cols,$primaryKeyColumns)) {
$metadata->mapOneToOne($associationMapping); $metadata->mapOneToOne($associationMapping);
else }
else {
$metadata->mapManyToOne($associationMapping); $metadata->mapManyToOne($associationMapping);
}
} }
} }

4
lib/Doctrine/ORM/Tools/EntityGenerator.php
View file

@ -894,10 +894,8 @@ public function <methodName>()
$lines[] = $this->_spaces . ' * @' . $this->_annotationsPrefix . 'Id'; $lines[] = $this->_spaces . ' * @' . $this->_annotationsPrefix . 'Id';
if ($generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) { if ($generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$lines[] = $this->_spaces.' * @' . $this->_annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")'; $lines[] = $this->_spaces . ' * @' . $this->_annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
} }
} }
$type = null; $type = null;