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

[DDC-1798] Exporter generate error when composite primary key is generated. Fixes GH-342

Browse source
This commit is contained in:
Benjamin Eberlei 2012-05-27 18:44:31 +02:00
parent 47ac61b3e0
commit 04b23dbf10
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) . ');'; $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 . ');'; $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; $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; $fieldMappings[$name] = $fieldMapping;
} }
if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) { if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$ids[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType; $ids[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
} }