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

Merge branch 'DDC-1798'

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-05-27 18:44:38 +02:00
commit 958d35a3f3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
View File

@ -92,7 +92,7 @@ class PhpExporter extends AbstractExporter
$lines[] = '$metadata->mapField(' . $this->_varExport($fieldMapping) . ');';
}
if ($generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
if ( ! $metadata->isIdentifierComposite && $generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_' . $generatorType . ');';
}

2
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
View File

@ -130,7 +130,7 @@ class XmlExporter extends AbstractExporter
}
}
if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$id[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
}

2
lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
View File

@ -114,7 +114,7 @@ class YamlExporter extends AbstractExporter
$fieldMappings[$name] = $fieldMapping;
}
if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$ids[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
}