RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1816] Verify XML <discriminator-column /> element works as expected/documented in tests.

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-07-08 09:06:52 +02:00
parent 18d4a2f970
commit 7b758eee57
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -334,7 +334,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
$class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal'); $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal');
$this->assertEquals( $this->assertEquals(
array('name' => 'dtype', 'type' => 'string', 'length' => 255, 'fieldName' => 'dtype'), array('name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null),
$class->discriminatorColumn $class->discriminatorColumn
); );
} }
@ -941,6 +941,7 @@ class User
* @Entity * @Entity
* @InheritanceType("SINGLE_TABLE") * @InheritanceType("SINGLE_TABLE")
* @DiscriminatorMap({"cat" = "Cat", "dog" = "Dog"}) * @DiscriminatorMap({"cat" = "Cat", "dog" = "Dog"})
* @DiscriminatorColumn(name="discr", length=32, type="string")
*/ */
abstract class Animal abstract class Animal
{ {

3
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.Animal.dcm.xml
View File

@ -8,9 +8,10 @@
<discriminator-mapping value="cat" class="Cat" /> <discriminator-mapping value="cat" class="Cat" />
<discriminator-mapping value="dog" class="Dog" /> <discriminator-mapping value="dog" class="Dog" />
</discriminator-map> </discriminator-map>
<discriminator-column name="discr" type="string" length="32" />
<id name="id" type="integer" column="id"> <id name="id" type="integer" column="id">
<generator strategy="CUSTOM" /> <generator strategy="CUSTOM" />
<custom-id-generator class="stdClass" /> <custom-id-generator class="stdClass" />
</id> </id>
</entity> </entity>
</doctrine-mapping> </doctrine-mapping>

6
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.Animal.dcm.yml
View File

@ -4,10 +4,14 @@ Doctrine\Tests\ORM\Mapping\Animal:
discriminatorMap: discriminatorMap:
cat: Cat cat: Cat
dog: Dog dog: Dog
discriminatorColumn:
type: string
name: discr
length: 32
id: id:
id: id:
type: integer type: integer
generator: generator:
strategy: CUSTOM strategy: CUSTOM
customIdGenerator: customIdGenerator:
class: stdClass class: stdClass