From 4935da138d49b46497662798559f7c2b9197e3bd Mon Sep 17 00:00:00 2001 From: Andrey Knupp Vital Date: Thu, 8 Jan 2015 00:10:24 -0200 Subject: [PATCH] Respecting `use-column-prefix` instead of relying on false/0 of `column-prefix` --- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 622a79a9e..a65d4e1ab 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -259,14 +259,16 @@ class XmlDriver extends FileDriver ? (string) $embeddedMapping['column-prefix'] : null; - $preventPrefixing = ( - $columnPrefix === '0' || $columnPrefix === 'false' - ); + $useColumnPrefix = isset($embeddedMapping['use-column-prefix']) + ? $this->evaluateBoolean( + $embeddedMapping['use-column-prefix'] + ) + : true; $mapping = array( 'fieldName' => (string) $embeddedMapping['name'], 'class' => (string) $embeddedMapping['class'], - 'columnPrefix' => $preventPrefixing ? false : $columnPrefix + 'columnPrefix' => !$useColumnPrefix ? false : $columnPrefix ); $metadata->mapEmbedded($mapping);