From a0c9e9db8dc6a64fe247d9627390254a6a95f984 Mon Sep 17 00:00:00 2001
From: jwage <jwage@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 30 Oct 2009 20:24:50 +0000
Subject: [PATCH] [2.0] Fixing casing issue

---
 lib/Doctrine/ORM/Query/SqlWalker.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 5103a650e..862b33e32 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -475,7 +475,7 @@ class SqlWalker implements TreeWalker
                 
                 $columnAlias = $this->_platform->getSqlResultCasing($columnAlias);
                 $this->_rsm->setDiscriminatorColumn($dqlAlias, $columnAlias);
-                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName']);
+                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSqlResultCasing($columnAlias), $discrColumn['fieldName']);
                 
                 // Add foreign key columns to SQL, if necessary
                 if ($addMetaColumns) {
@@ -494,7 +494,7 @@ class SqlWalker implements TreeWalker
                                 $sql .= ", $sqlTableAlias." . $assoc->getQuotedJoinColumnName($srcColumn, $this->_platform) 
                                       . ' AS ' . $columnAlias;
                                 $columnAlias = $this->_platform->getSqlResultCasing($columnAlias);
-                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn);
+                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSqlResultCasing($columnAlias), $srcColumn);
                             }
                         }
                     }
@@ -509,7 +509,7 @@ class SqlWalker implements TreeWalker
                                 $columnAlias = $this->getSqlColumnAlias($srcColumn);
                                 $sql .= ', ' . $sqlTableAlias . '.' . $assoc->getQuotedJoinColumnName($srcColumn, $this->_platform) . ' AS ' . $columnAlias;
                                 $columnAlias = $this->_platform->getSqlResultCasing($columnAlias);
-                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn);
+                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSqlResultCasing($columnAlias), $srcColumn);
                             }
                         }
                     }
@@ -848,7 +848,7 @@ class SqlWalker implements TreeWalker
                                 $columnAlias = $this->getSqlColumnAlias($srcColumn);
                                 $sql .= $sqlTableAlias . '.' . $assoc->getQuotedJoinColumnName($srcColumn, $this->_platform)
                                         . ' AS ' . $columnAlias;
-                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn);
+                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSqlResultCasing($columnAlias), $srcColumn);
                             }
                         }
                     }