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

Rename custom-generator to custom-id-generator in XML mappint to match name in other mapping types

Browse source
This commit is contained in:
Vitali Yakavenka 2011-11-28 23:36:23 +03:00
parent a8787be0bf
commit b72d150d33
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doctrine-mapping.xsd
View file

@ -254,7 +254,7 @@
<xs:sequence> <xs:sequence>
<xs:element name="generator" type="orm:generator" minOccurs="0" /> <xs:element name="generator" type="orm:generator" minOccurs="0" />
<xs:element name="sequence-generator" type="orm:sequence-generator" minOccurs="0" maxOccurs="1" /> <xs:element name="sequence-generator" type="orm:sequence-generator" minOccurs="0" maxOccurs="1" />
<xs:element name="custom-generator" type="orm:custom-generator" minOccurs="0" maxOccurs="1" /> <xs:element name="custom-id-generator" type="orm:custom-id-generator" minOccurs="0" maxOccurs="1" />
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:NMTOKEN" use="required" /> <xs:attribute name="name" type="xs:NMTOKEN" use="required" />
@ -274,7 +274,7 @@
<xs:anyAttribute namespace="##other"/> <xs:anyAttribute namespace="##other"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="custom-generator"> <xs:complexType name="custom-id-generator">
<xs:sequence> <xs:sequence>
<xs:element name="args" minOccurs="0" maxOccurs="1"> <xs:element name="args" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>

4
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file

@ -250,8 +250,8 @@ class XmlDriver extends AbstractFileDriver
'allocationSize' => (string)$seqGenerator['allocation-size'], 'allocationSize' => (string)$seqGenerator['allocation-size'],
'initialValue' => (string)$seqGenerator['initial-value'] 'initialValue' => (string)$seqGenerator['initial-value']
)); ));
} else if (isset($idElement->{'custom-generator'})) { } else if (isset($idElement->{'custom-id-generator'})) {
$customGenerator = $idElement->{'custom-generator'}; $customGenerator = $idElement->{'custom-id-generator'};
$args = array(); $args = array();
foreach ($customGenerator->args->children() as $argument) { foreach ($customGenerator->args->children() as $argument) {
$args[] = (string) $argument; $args[] = (string) $argument;

4
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.Animal.dcm.xml
View file

@ -10,12 +10,12 @@
</discriminator-map> </discriminator-map>
<id name="id" type="integer" column="id"> <id name="id" type="integer" column="id">
<generator strategy="CUSTOM"/> <generator strategy="CUSTOM"/>
<custom-generator class="stdClass"> <custom-id-generator class="stdClass">
<args> <args>
<arg>par1</arg> <arg>par1</arg>
<arg>par2</arg> <arg>par2</arg>
</args> </args>
</custom-generator> </custom-id-generator>
</id> </id>
</entity> </entity>
</doctrine-mapping> </doctrine-mapping>