From fe5a356aa06e3a52c354382edb11626c465f9412 Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Sat, 3 Oct 2009 16:19:51 +0000 Subject: [PATCH] [2.0][DDC-31] Fixed issue with column definition of 'name' when it is not set. --- lib/Doctrine/ORM/Mapping/ClassMetadata.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php index 1e3d0faca..f25c55b82 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php @@ -1567,9 +1567,14 @@ final class ClassMetadata public function setDiscriminatorColumn($columnDef) { $this->discriminatorColumn = $columnDef; + if ( ! isset($columnDef['fieldName'])) { $this->discriminatorColumn['fieldName'] = $columnDef['name']; } + + if ( ! isset($columnDef['name'])) { + $this->discriminatorColumn['name'] = $this->discriminatorColumn['fieldName']; + } } /**