From fa79de6ea43ee59aeaa08009ca3f0c31615e92b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20St=C3=B6ckl?= Date: Thu, 13 Mar 2014 16:47:22 +0100 Subject: [PATCH] Enable empty prefixes for inlined embeddable This fixes http://www.doctrine-project.org/jira/browse/DDC-2987 This makes it possible to map a field from an embeddable to a database field with the same name, without any prefix added. Example: - an embeddable object "Id" with a property "id" - per default this would map inline to id_id - supplying null or '' as columnPrefix does not work due to the ! empty() check - with my little change, if columnPrefix : false is supplied in the mapping config this will now map to a db column "id" To build Ids as ValueObjects is a very common approach in DDD, so ihmo this is a must have. --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 8770cb4ac..50dc3baa3 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -3187,7 +3187,7 @@ class ClassMetadataInfo implements ClassMetadata $fieldMapping['originalField'] = $fieldMapping['fieldName']; $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName']; - $fieldMapping['columnName'] = ! empty($this->embeddedClasses[$property]['columnPrefix']) + $fieldMapping['columnName'] = ! empty($this->embeddedClasses[$property]['columnPrefix']) || $this->embeddedClasses[$property]['columnPrefix'] === false ? $this->embeddedClasses[$property]['columnPrefix'] . $fieldMapping['columnName'] : $this->namingStrategy->embeddedFieldToColumnName($property, $fieldMapping['columnName'], $this->reflClass->name, $embeddable->reflClass->name);