RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 23:39:25 +03:00
Code Issues Projects Releases Wiki Activity

makes column prefix configurable

Browse Source
This commit is contained in:
Johannes M. Schmitt 2013-11-02 14:07:14 +01:00
parent 2b2f4894cb
commit 17e0a7b2f8
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -3088,7 +3088,8 @@ class ClassMetadataInfo implements ClassMetadata
$this->assertFieldNotMapped($mapping['fieldName']); $this->assertFieldNotMapped($mapping['fieldName']);
$this->embeddedClasses[$mapping['fieldName']] = array( $this->embeddedClasses[$mapping['fieldName']] = array(
'class' => $this->fullyQualifiedClassName($mapping['class']) 'class' => $this->fullyQualifiedClassName($mapping['class']),
'columnPrefix' => $mapping['columnPrefix'],
); );
} }
@ -3104,7 +3105,10 @@ class ClassMetadataInfo implements ClassMetadata
$fieldMapping['declaredField'] = $property; $fieldMapping['declaredField'] = $property;
$fieldMapping['originalField'] = $fieldMapping['fieldName']; $fieldMapping['originalField'] = $fieldMapping['fieldName'];
$fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName']; $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName'];
$fieldMapping['columnName'] = $this->namingStrategy->embeddedFieldToColumnName($property, $fieldMapping['columnName'], $this->reflClass->name, $embeddable->reflClass->name);
$fieldMapping['columnName'] = ! empty($this->embeddedClasses[$property]['columnPrefix'])
? $this->embeddedClasses[$property]['columnPrefix'] . $fieldMapping['columnName']
: $this->namingStrategy->embeddedFieldToColumnName($property, $fieldMapping['columnName'], $this->reflClass->name, $embeddable->reflClass->name);
$this->mapField($fieldMapping); $this->mapField($fieldMapping);
} }

1
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -370,6 +370,7 @@ class AnnotationDriver extends AbstractAnnotationDriver
$metadata->mapManyToMany($mapping); $metadata->mapManyToMany($mapping);
} else if ($embeddedAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Embedded')) { } else if ($embeddedAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Embedded')) {
$mapping['class'] = $embeddedAnnot->class; $mapping['class'] = $embeddedAnnot->class;
$mapping['columnPrefix'] = $embeddedAnnot->columnPrefix;
$metadata->mapEmbedded($mapping); $metadata->mapEmbedded($mapping);
} }
} }

6
lib/Doctrine/ORM/Mapping/Embedded.php
View File

@ -26,7 +26,13 @@ namespace Doctrine\ORM\Mapping;
final class Embedded implements Annotation final class Embedded implements Annotation
{ {
/** /**
* @Required
* @var string * @var string
*/ */
public $class; public $class;
/**
* @var string
*/
public $columnPrefix;
} }