RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Respecting use-column-prefix instead of relying on false/0 of column-prefix

Browse Source
This commit is contained in:
Andrey Knupp Vital 2015-01-08 00:10:24 -02:00
parent c964dd0cd2
commit 4935da138d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -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);