Permalink
Browse files

Merge branch 'DDC-1798'

  • Loading branch information...
2 parents 47ac61b + 04b23db commit 958d35a3f3c837bd7d0ccebc96a4bdcb92dada98 @beberlei beberlei committed May 27, 2012
@@ -92,7 +92,7 @@ public function exportClassMetadata(ClassMetadataInfo $metadata)
$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 . ');';
}
@@ -130,7 +130,7 @@ public function exportClassMetadata(ClassMetadataInfo $metadata)
}
}
- if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
+ if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$id[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
}
@@ -114,7 +114,7 @@ public function exportClassMetadata(ClassMetadataInfo $metadata)
$fieldMappings[$name] = $fieldMapping;
}
- if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
+ if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
$ids[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
}

0 comments on commit 958d35a

Please sign in to comment.