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

Merge branch 'DDC-928'

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-12-28 12:19:16 +01:00
commit eeca184836
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
View File

@ -188,7 +188,6 @@ class ConvertDoctrine1Schema
$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
} else if (isset($column['sequence'])) { } else if (isset($column['sequence'])) {
$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
$metadata->setSequenceGeneratorDefinition($definition);
$definition = array( $definition = array(
'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name']:$column['sequence'] 'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name']:$column['sequence']
); );
@ -198,6 +197,7 @@ class ConvertDoctrine1Schema
if (isset($column['sequence']['value'])) { if (isset($column['sequence']['value'])) {
$definition['initialValue'] = $column['sequence']['value']; $definition['initialValue'] = $column['sequence']['value'];
} }
$metadata->setSequenceGeneratorDefinition($definition);
} }
return $fieldMapping; return $fieldMapping;
} }