1
0
mirror of synced 2025-02-02 13:31:45 +03:00

Merge branch 'DDC-2638' into 2.4

This commit is contained in:
Benjamin Eberlei 2013-09-07 09:04:34 +02:00
commit c206728c96

View File

@ -911,7 +911,7 @@ public function __construct()
protected function generateDiscriminatorColumnAnnotation($metadata) protected function generateDiscriminatorColumnAnnotation($metadata)
{ {
if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) { if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) {
$discrColumn = $metadata->discriminatorValue; $discrColumn = $metadata->discriminatorColumn;
$columnDefinition = 'name="' . $discrColumn['name'] $columnDefinition = 'name="' . $discrColumn['name']
. '", type="' . $discrColumn['type'] . '", type="' . $discrColumn['type']
. '", length=' . $discrColumn['length']; . '", length=' . $discrColumn['length'];