From 83ef47c8d0d603ea1d7352c64d92674b568d2693 Mon Sep 17 00:00:00 2001 From: Anton Stoeckl Date: Fri, 14 Mar 2014 12:34:22 +0100 Subject: [PATCH] This fixes ticket DDC-3028 Enables columnPrefix to be "false" so no prefix is added. Changed the structure a bit (to if/else) to be more readable with the additional condition. --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 3de7a5c46..62ea7bb9b 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -3200,10 +3200,6 @@ class ClassMetadataInfo implements ClassMetadata ); } -// $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); - $this->mapField($fieldMapping); } }