From 82cda1ecb006b6318b94c9791a74c949428cca05 Mon Sep 17 00:00:00 2001 From: Andrey Knupp Vital Date: Wed, 7 Jan 2015 17:14:59 -0200 Subject: [PATCH] Prevents prefixing a column when `false` on `column-prefix` (XML) --- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 45836a6b9..2ae7be78c 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -255,11 +255,20 @@ class XmlDriver extends FileDriver if (isset($xmlRoot->embedded)) { foreach ($xmlRoot->embedded as $embeddedMapping) { + $columnPrefix = isset($embeddedMapping['column-prefix']) + ? (string) $embeddedMapping['column-prefix'] + : null; + + $preventPrefixing = ( + $columnPrefix === '0' || $columnPrefix === 'false' + ); + $mapping = array( 'fieldName' => (string) $embeddedMapping['name'], 'class' => (string) $embeddedMapping['class'], - 'columnPrefix' => isset($embeddedMapping['column-prefix']) ? (string) $embeddedMapping['column-prefix'] : null, + 'columnPrefix' => $preventPrefixing ? false : $columnPrefix ); + $metadata->mapEmbedded($mapping); } }