RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 00:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge commit 'upstream/master'

Browse Source
This commit is contained in:
Roman S. Borschel 2010-04-30 17:31:53 +02:00
commit 39a6c01978
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -203,9 +203,9 @@ class XmlDriver extends AbstractFileDriver
if (isset($idElement->{'sequence-generator'})) { if (isset($idElement->{'sequence-generator'})) {
$seqGenerator = $idElement->{'sequence-generator'}; $seqGenerator = $idElement->{'sequence-generator'};
$metadata->setSequenceGeneratorDefinition(array( $metadata->setSequenceGeneratorDefinition(array(
'sequenceName' => $seqGenerator->{'sequence-name'}, 'sequenceName' => (string)$seqGenerator['sequence-name'],
'allocationSize' => $seqGenerator->{'allocation-size'}, 'allocationSize' => (string)$seqGenerator['allocation-size'],
'initialValue' => $seqGeneratorAnnot->{'initial-value'} 'initialValue' => (string)$seqGeneratorAnnot['initial-value']
)); ));
} else if (isset($idElement->{'table-generator'})) { } else if (isset($idElement->{'table-generator'})) {
throw MappingException::tableIdGeneratorNotImplemented($className); throw MappingException::tableIdGeneratorNotImplemented($className);

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

@ -53,7 +53,7 @@ class XmlExporter extends AbstractExporter
$xml->addAttribute('xmlns', 'http://doctrine-project.org/schemas/orm/doctrine-mapping'); $xml->addAttribute('xmlns', 'http://doctrine-project.org/schemas/orm/doctrine-mapping');
$xml->addAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); $xml->addAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
$xml->addAttribute('xsi:schemaLocation', 'http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd'); $xml->addAttribute('xsi:schemaLocation', 'http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd');
if ($metadata->isMappedSuperclass) { if ($metadata->isMappedSuperclass) {
$root = $xml->addChild('mapped-superclass'); $root = $xml->addChild('mapped-superclass');