From db06355b636fe7b36e614eb3587e5063e7a64f47 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 4 Feb 2015 23:46:15 +0000 Subject: [PATCH] #1294 - fixing differences between 2.5 and 2.4 fixes (reverts DBAL dependency bump) --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 2845e720c..caba0b637 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -449,12 +449,10 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $sequenceName = null; $fieldName = $class->identifier ? $class->getSingleIdentifierFieldName() : null; - // Platforms that do not have native IDENTITY support need a sequence to emulate this behaviour. - if ($this->getTargetPlatform()->usesSequenceEmulatedIdentityColumns()) { + if ($this->getTargetPlatform() instanceof Platforms\PostgreSQLPlatform) { $columnName = $class->getSingleIdentifierColumnName(); $quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']); - $sequencePrefix = $class->getSequencePrefix($this->getTargetPlatform()); - $sequenceName = $this->getTargetPlatform()->getIdentitySequenceName($sequencePrefix, $columnName); + $sequenceName = $class->getTableName() . '_' . $columnName . '_seq'; $definition = array( 'sequenceName' => $this->getTargetPlatform()->fixSchemaElementName($sequenceName) ); @@ -484,10 +482,10 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory if ( ! $definition) { $fieldName = $class->getSingleIdentifierFieldName(); - $sequenceName = $class->getSequenceName($this->getTargetPlatform()); + $columnName = $class->getSingleIdentifierColumnName(); $quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']); - - $definition = array( + $sequenceName = $class->getTableName() . '_' . $columnName . '_seq'; + $definition = array( 'sequenceName' => $this->getTargetPlatform()->fixSchemaElementName($sequenceName), 'allocationSize' => 1, 'initialValue' => 1,