diff --git a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
index 670cf11e7..84540a337 100644
--- a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
+++ b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
@@ -62,7 +62,7 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister
     {
         $columnName = $class->columnNames[$field];
         $sql = $this->_getSQLTableAlias($class->name, $alias == 'r' ? '' : $alias) . '.' . $class->getQuotedColumnName($field, $this->_platform);
-        $columnAlias = $this->_platform->getSQLResultCasing($columnName . $this->_sqlAliasCounter++);
+        $columnAlias = $this->getSQLColumnAlias($columnName);
         $this->_rsm->addFieldResult($alias, $columnAlias, $field, $class->name);
 
         return $sql . ' AS ' . $columnAlias;
@@ -70,10 +70,9 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister
 
     protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $className)
     {
-        $columnAlias = $joinColumnName . $this->_sqlAliasCounter++;
-        $resultColumnName = $this->_platform->getSQLResultCasing($columnAlias);
-        $this->_rsm->addMetaResult('r', $resultColumnName, $joinColumnName);
+        $columnAlias = $this->getSQLColumnAlias($joinColumnName);
+        $this->_rsm->addMetaResult('r', $columnAlias, $joinColumnName);
         
         return $tableAlias . '.' . $joinColumnName . ' AS ' . $columnAlias;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
index fab80ff29..b147f3dd5 100644
--- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -1060,9 +1060,8 @@ class BasicEntityPersister
             foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
                 if ($columnList) $columnList .= ', ';
 
-                $columnAlias = $srcColumn . $this->_sqlAliasCounter++;
-                $resultColumnName = $this->_platform->getSQLResultCasing($columnAlias);
-                $columnList .= $this->_getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) )
+                $resultColumnName = $this->getSQLColumnAlias($srcColumn);
+                $columnList .= $this->_getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) )  
                              . '.' . $srcColumn . ' AS ' . $resultColumnName;
                 $this->_rsm->addMetaResult($alias, $resultColumnName, $srcColumn, isset($assoc['id']) && $assoc['id'] === true);
             }
@@ -1180,10 +1179,9 @@ class BasicEntityPersister
      */
     protected function _getSelectColumnSQL($field, ClassMetadata $class, $alias = 'r')
     {
-        $columnName = $class->columnNames[$field];
-        $sql = $this->_getSQLTableAlias($class->name, $alias == 'r' ? '' : $alias)
+        $sql = $this->_getSQLTableAlias($class->name, $alias == 'r' ? '' : $alias) 
              . '.' . $class->getQuotedColumnName($field, $this->_platform);
-        $columnAlias = $this->_platform->getSQLResultCasing($columnName . $this->_sqlAliasCounter++);
+        $columnAlias = $this->getSQLColumnAlias($class->columnNames[$field]);
 
         $this->_rsm->addFieldResult($alias, $columnAlias, $field);
 
@@ -1500,4 +1498,19 @@ class BasicEntityPersister
 
         return (bool) $this->_conn->fetchColumn($sql, $params);
     }
+
+    /**
+     * Gets an SQL column alias for a column name.
+     *
+     * @param string $columnName
+     * @return string
+     */
+    public function getSQLColumnAlias($columnName)
+    {
+        // Trim the column alias to the maximum identifier length of the platform.
+        // If the alias is to long, characters are cut off from the beginning.
+        return $this->_platform->getSQLResultCasing(
+            substr($columnName . $this->_sqlAliasCounter++, -$this->_platform->getMaxIdentifierLength())
+        );
+    }
 }
diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
index d1690b72c..f84686ad2 100644
--- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
+++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
@@ -86,20 +86,22 @@ class ResultSetMappingBuilder extends ResultSetMapping
             if (isset($renamedColumns[$columnName])) {
                 $columnName = $renamedColumns[$columnName];
             }
+            $columnName = $platform->getSQLResultCasing($columnName);
             if (isset($this->fieldMappings[$columnName])) {
                 throw new \InvalidArgumentException("The column '$columnName' conflicts with another column in the mapper.");
             }
-            $this->addFieldResult($alias, $platform->getSQLResultCasing($columnName), $propertyName);
+            $this->addFieldResult($alias, $columnName, $propertyName);
         }
         foreach ($classMetadata->associationMappings AS $associationMapping) {
             if ($associationMapping['isOwningSide'] && $associationMapping['type'] & ClassMetadataInfo::TO_ONE) {
                 foreach ($associationMapping['joinColumns'] AS $joinColumn) {
                     $columnName = $joinColumn['name'];
                     $renamedColumnName = isset($renamedColumns[$columnName]) ? $renamedColumns[$columnName] : $columnName;
+                    $renamedColumnName = $platform->getSQLResultCasing($renamedColumnName);
                     if (isset($this->metaMappings[$renamedColumnName])) {
                         throw new \InvalidArgumentException("The column '$renamedColumnName' conflicts with another column in the mapper.");
                     }
-                    $this->addMetaResult($alias, $platform->getSQLResultCasing($renamedColumnName), $platform->getSQLResultCasing($columnName));
+                    $this->addMetaResult($alias, $renamedColumnName, $columnName);
                 }
             }
         }
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 8939d198e..45837bf1f 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -160,18 +160,18 @@ class SqlWalker implements TreeWalker
         switch (true) {
             case ($AST instanceof AST\DeleteStatement):
                 $primaryClass = $this->_em->getClassMetadata($AST->deleteClause->abstractSchemaName);
-                
+
                 return ($primaryClass->isInheritanceTypeJoined())
                     ? new Exec\MultiTableDeleteExecutor($AST, $this)
                     : new Exec\SingleTableDeleteUpdateExecutor($AST, $this);
-                
+
             case ($AST instanceof AST\UpdateStatement):
                 $primaryClass = $this->_em->getClassMetadata($AST->updateClause->abstractSchemaName);
-                
-                return ($primaryClass->isInheritanceTypeJoined()) 
+
+                return ($primaryClass->isInheritanceTypeJoined())
                     ? new Exec\MultiTableUpdateExecutor($AST, $this)
                     : new Exec\SingleTableDeleteUpdateExecutor($AST, $this);
-                
+
             default:
                 return new Exec\SingleSelectExecutor($AST, $this);
         }
@@ -221,7 +221,11 @@ class SqlWalker implements TreeWalker
      */
     public function getSQLColumnAlias($columnName)
     {
-        return $columnName . $this->_aliasCounter++;
+        // Trim the column alias to the maximum identifier length of the platform.
+        // If the alias is to long, characters are cut off from the beginning.
+        return $this->_platform->getSQLResultCasing(
+            substr($columnName . $this->_aliasCounter++, -$this->_platform->getMaxIdentifierLength())
+        );
     }
 
     /**
@@ -242,12 +246,12 @@ class SqlWalker implements TreeWalker
         foreach ($class->parentClasses as $parentClassName) {
             $parentClass = $this->_em->getClassMetadata($parentClassName);
             $tableAlias = $this->getSQLTableAlias($parentClass->getTableName(), $dqlAlias);
-            
+
             // If this is a joined association we must use left joins to preserve the correct result.
             $sql .= isset($this->_queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER ';
             $sql .= 'JOIN ' . $parentClass->getQuotedTableName($this->_platform) . ' ' . $tableAlias . ' ON ';
             $first = true;
-            
+
             foreach ($class->getQuotedIdentifierColumnNames($this->_platform) as $columnName) {
                 if ($first) $first = false; else $sql .= ' AND ';
 
@@ -262,7 +266,7 @@ class SqlWalker implements TreeWalker
                 $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
                 $sql .= ' LEFT JOIN ' . $subClass->getQuotedTableName($this->_platform) . ' ' . $tableAlias . ' ON ';
                 $first = true;
-                
+
                 foreach ($class->getQuotedIdentifierColumnNames($this->_platform) as $columnName) {
                     if ($first) $first = false; else $sql .= ' AND ';
 
@@ -277,10 +281,10 @@ class SqlWalker implements TreeWalker
     private function _generateOrderedCollectionOrderByItems()
     {
         $sql = '';
-        
+
         foreach ($this->_selectedClasses AS $dqlAlias => $class) {
             $qComp = $this->_queryComponents[$dqlAlias];
-            
+
             if (isset($qComp['relation']['orderBy'])) {
                 foreach ($qComp['relation']['orderBy'] AS $fieldName => $orientation) {
                     $tableName = ($qComp['metadata']->isInheritanceTypeJoined())
@@ -290,13 +294,13 @@ class SqlWalker implements TreeWalker
                     if ($sql != '') {
                         $sql .= ', ';
                     }
-                    
-                    $sql .= $this->getSQLTableAlias($tableName, $dqlAlias) . '.' 
+
+                    $sql .= $this->getSQLTableAlias($tableName, $dqlAlias) . '.'
                           . $qComp['metadata']->getQuotedColumnName($fieldName, $this->_platform) . ' ' . $orientation;
                 }
             }
         }
-        
+
         return $sql;
     }
 
@@ -317,7 +321,7 @@ class SqlWalker implements TreeWalker
             if ($class->isInheritanceTypeSingleTable()) {
                 $conn = $this->_em->getConnection();
                 $values = array();
-                
+
                 if ($class->discriminatorValue !== null) { // discrimnators can be 0
                     $values[] = $conn->quote($class->discriminatorValue);
                 }
@@ -389,7 +393,7 @@ class SqlWalker implements TreeWalker
     public function walkUpdateStatement(AST\UpdateStatement $AST)
     {
         $this->_useSqlTableAliases = false;
-        
+
         return $this->walkUpdateClause($AST->updateClause) . $this->walkWhereClause($AST->whereClause);
     }
 
@@ -402,7 +406,7 @@ class SqlWalker implements TreeWalker
     public function walkDeleteStatement(AST\DeleteStatement $AST)
     {
         $this->_useSqlTableAliases = false;
-        
+
         return $this->walkDeleteClause($AST->deleteClause) . $this->walkWhereClause($AST->whereClause);
     }
 
@@ -467,7 +471,7 @@ class SqlWalker implements TreeWalker
                 if ( ! $assoc['isOwningSide']) {
                     throw QueryException::associationPathInverseSideNotSupported();
                 }
-                
+
                 // COMPOSITE KEYS NOT (YET?) SUPPORTED
                 if (count($assoc['sourceToTargetKeyColumns']) > 1) {
                     throw QueryException::associationPathCompositeKeyNotSupported();
@@ -479,7 +483,7 @@ class SqlWalker implements TreeWalker
 
                 $sql .= reset($assoc['targetToSourceKeyColumns']);
                 break;
-                
+
             default:
                 throw QueryException::invalidPathExpression($pathExpr);
         }
@@ -522,10 +526,9 @@ class SqlWalker implements TreeWalker
                 $tblAlias = $this->getSQLTableAlias($rootClass->getTableName(), $dqlAlias);
                 $discrColumn = $rootClass->discriminatorColumn;
                 $columnAlias = $this->getSQLColumnAlias($discrColumn['name']);
-                
+
                 $sqlSelectExpressions[] = $tblAlias . '.' . $discrColumn['name'] . ' AS ' . $columnAlias;
 
-                $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
                 $this->_rsm->setDiscriminatorColumn($dqlAlias, $columnAlias);
                 $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName']);
 
@@ -540,14 +543,13 @@ class SqlWalker implements TreeWalker
                             } else {
                                 $sqlTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
                             }
-                            
+
                             foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
                                 $columnAlias = $this->getSQLColumnAlias($srcColumn);
-                                
+
                                 $sqlSelectExpressions[] = $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias;
-                                
-                                $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $srcColumn, (isset($assoc['id']) && $assoc['id'] === true));
+
+                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn, (isset($assoc['id']) && $assoc['id'] === true));
                             }
                         }
                     }
@@ -556,23 +558,22 @@ class SqlWalker implements TreeWalker
                 // Add foreign key columns to SQL, if necessary
                 if ($addMetaColumns) {
                     $sqlTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
-                    
+
                     foreach ($class->associationMappings as $assoc) {
                         if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
                             foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
                                 $columnAlias = $this->getSQLColumnAlias($srcColumn);
-                                
+
                                 $sqlSelectExpressions[] = $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias;
-                                
-                                $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $srcColumn, (isset($assoc['id']) && $assoc['id'] === true));
+
+                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn, (isset($assoc['id']) && $assoc['id'] === true));
                             }
                         }
                     }
                 }
             }
         }
-        
+
         $sql .= implode(', ', $sqlSelectExpressions);
 
         return $sql;
@@ -593,7 +594,7 @@ class SqlWalker implements TreeWalker
 
             $rangeDecl = $identificationVariableDecl->rangeVariableDeclaration;
             $dqlAlias = $rangeDecl->aliasIdentificationVariable;
-        
+
             $this->_rootAliases[] = $dqlAlias;
 
             $class = $this->_em->getClassMetadata($rangeDecl->abstractSchemaName);
@@ -710,12 +711,12 @@ class SqlWalker implements TreeWalker
 
         $joinAssocPathExpr = $join->joinAssociationPathExpression;
         $joinedDqlAlias    = $join->aliasIdentificationVariable;
-        
+
         $relation        = $this->_queryComponents[$joinedDqlAlias]['relation'];
         $targetClass     = $this->_em->getClassMetadata($relation['targetEntity']);
         $sourceClass     = $this->_em->getClassMetadata($relation['sourceEntity']);
         $targetTableName = $targetClass->getQuotedTableName($this->_platform);
-        
+
         $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName(), $joinedDqlAlias);
         $sourceTableAlias = $this->getSQLTableAlias($sourceClass->getTableName(), $joinAssocPathExpr->identificationVariable);
 
@@ -850,7 +851,7 @@ class SqlWalker implements TreeWalker
 
         return $sql;
     }
-    
+
     /**
      * Walks down a CaseExpression AST node and generates the corresponding SQL.
      *
@@ -862,21 +863,21 @@ class SqlWalker implements TreeWalker
         switch (true) {
             case ($expression instanceof AST\CoalesceExpression):
                 return $this->walkCoalesceExpression($expression);
-                
+
             case ($expression instanceof AST\NullIfExpression):
                 return $this->walkNullIfExpression($expression);
-                
+
             case ($expression instanceof AST\GeneralCaseExpression):
                 return $this->walkGeneralCaseExpression($expression);
-                
+
             case ($expression instanceof AST\SimpleCaseExpression):
                 return $this->walkSimpleCaseExpression($expression);
-                
+
             default:
                 return '';
         }
     }
-    
+
     /**
      * Walks down a CoalesceExpression AST node and generates the corresponding SQL.
      *
@@ -886,18 +887,18 @@ class SqlWalker implements TreeWalker
     public function walkCoalesceExpression($coalesceExpression)
     {
         $sql = 'COALESCE(';
-        
+
         $scalarExpressions = array();
-        
+
         foreach ($coalesceExpression->scalarExpressions as $scalarExpression) {
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
-        
+
         $sql .= implode(', ', $scalarExpressions) . ')';
-        
+
         return $sql;
     }
-    
+
     /**
      * Walks down a NullIfExpression AST node and generates the corresponding SQL.
      *
@@ -906,17 +907,17 @@ class SqlWalker implements TreeWalker
      */
     public function walkNullIfExpression($nullIfExpression)
     {
-        $firstExpression = is_string($nullIfExpression->firstExpression) 
+        $firstExpression = is_string($nullIfExpression->firstExpression)
             ? $this->_conn->quote($nullIfExpression->firstExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->firstExpression);
-        
-        $secondExpression = is_string($nullIfExpression->secondExpression) 
+
+        $secondExpression = is_string($nullIfExpression->secondExpression)
             ? $this->_conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
-        
+
         return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
     }
-    
+
     /**
      * Walks down a GeneralCaseExpression AST node and generates the corresponding SQL.
      *
@@ -926,17 +927,17 @@ class SqlWalker implements TreeWalker
     public function walkGeneralCaseExpression(AST\GeneralCaseExpression $generalCaseExpression)
     {
         $sql = 'CASE';
-        
+
         foreach ($generalCaseExpression->whenClauses as $whenClause) {
             $sql .= ' WHEN ' . $this->walkConditionalExpression($whenClause->caseConditionExpression);
             $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
         }
-        
+
         $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END';
-        
+
         return $sql;
     }
-    
+
     /**
      * Walks down a SimpleCaseExpression AST node and generates the corresponding SQL.
      *
@@ -946,14 +947,14 @@ class SqlWalker implements TreeWalker
     public function walkSimpleCaseExpression($simpleCaseExpression)
     {
         $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
-        
+
         foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) {
             $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
             $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
         }
-        
+
         $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
-        
+
         return $sql;
     }
 
@@ -973,7 +974,7 @@ class SqlWalker implements TreeWalker
             if ($expr->type !== AST\PathExpression::TYPE_STATE_FIELD) {
                 throw QueryException::invalidPathExpression($expr->type);
             }
-            
+
             $fieldName = $expr->field;
             $dqlAlias = $expr->identificationVariable;
             $qComp = $this->_queryComponents[$dqlAlias];
@@ -996,8 +997,7 @@ class SqlWalker implements TreeWalker
 
             $columnAlias = $this->getSQLColumnAlias($columnName);
             $sql .= $sqlTableAlias . '.' . $columnName . ' AS ' . $columnAlias;
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-            
+
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1008,12 +1008,10 @@ class SqlWalker implements TreeWalker
                 $resultAlias = $selectExpression->fieldIdentificationVariable;
             }
 
-            $columnAlias = 'sclr' . $this->_aliasCounter++;
+            $columnAlias = $this->getSQLColumnAlias('sclr');
             $sql .= $this->walkAggregateExpression($expr) . ' AS ' . $columnAlias;
             $this->_scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1024,12 +1022,10 @@ class SqlWalker implements TreeWalker
                 $resultAlias = $selectExpression->fieldIdentificationVariable;
             }
 
-            $columnAlias = 'sclr' . $this->_aliasCounter++;
+            $columnAlias = $this->getSQLColumnAlias('sclr');
             $sql .= '(' . $this->walkSubselect($expr) . ') AS '.$columnAlias;
             $this->_scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-            
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1040,12 +1036,10 @@ class SqlWalker implements TreeWalker
                 $resultAlias = $selectExpression->fieldIdentificationVariable;
             }
 
-            $columnAlias = 'sclr' . $this->_aliasCounter++;
+            $columnAlias = $this->getSQLColumnAlias('sclr');
             $sql .= $this->walkFunction($expr) . ' AS ' . $columnAlias;
             $this->_scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-            
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1062,18 +1056,15 @@ class SqlWalker implements TreeWalker
                 $resultAlias = $selectExpression->fieldIdentificationVariable;
             }
 
-            $columnAlias = 'sclr' . $this->_aliasCounter++;
-            
+            $columnAlias = $this->getSQLColumnAlias('sclr');
             if ($expr instanceof AST\Literal) {
                 $sql .= $this->walkLiteral($expr) . ' AS ' .$columnAlias;
             } else {
                 $sql .= $this->walkSimpleArithmeticExpression($expr) . ' AS ' . $columnAlias;
             }
-            
+
             $this->_scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-            
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1089,14 +1080,11 @@ class SqlWalker implements TreeWalker
                 $resultAlias = $selectExpression->fieldIdentificationVariable;
             }
 
-            $columnAlias = 'sclr' . $this->_aliasCounter++;
-            
+            $columnAlias = $this->getSQLColumnAlias('sclr');
             $sql .= $this->walkCaseExpression($expr) . ' AS ' . $columnAlias;
-            
+
             $this->_scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-            $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-            
             if ( ! $hidden) {
                 $this->_rsm->addScalarResult($columnAlias, $resultAlias);
             }
@@ -1116,16 +1104,16 @@ class SqlWalker implements TreeWalker
             if ( ! isset($this->_selectedClasses[$dqlAlias])) {
                 $this->_selectedClasses[$dqlAlias] = $class;
             }
-            
+
             $beginning = true;
-            
+
             // Select all fields from the queried class
             foreach ($class->fieldMappings as $fieldName => $mapping) {
                 if ($partialFieldSet && !in_array($fieldName, $partialFieldSet)) {
                     continue;
                 }
 
-                $tableName = (isset($mapping['inherited'])) 
+                $tableName = (isset($mapping['inherited']))
                     ? $this->_em->getClassMetadata($mapping['inherited'])->getTableName()
                     : $class->getTableName();
 
@@ -1136,8 +1124,6 @@ class SqlWalker implements TreeWalker
                 $sql .= $sqlTableAlias . '.' . $class->getQuotedColumnName($fieldName, $this->_platform)
                       . ' AS ' . $columnAlias;
 
-                $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
-                
                 $this->_rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $class->name);
             }
 
@@ -1149,7 +1135,7 @@ class SqlWalker implements TreeWalker
                 foreach ($class->subClasses as $subClassName) {
                     $subClass = $this->_em->getClassMetadata($subClassName);
                     $sqlTableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
-                    
+
                     foreach ($subClass->fieldMappings as $fieldName => $mapping) {
                         if (isset($mapping['inherited']) || $partialFieldSet && !in_array($fieldName, $partialFieldSet)) {
                             continue;
@@ -1161,7 +1147,6 @@ class SqlWalker implements TreeWalker
                         $sql .= $sqlTableAlias . '.' . $subClass->getQuotedColumnName($fieldName, $this->_platform)
                                 . ' AS ' . $columnAlias;
 
-                        $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
                         $this->_rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $subClassName);
                     }
 
@@ -1171,11 +1156,11 @@ class SqlWalker implements TreeWalker
                         if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE && ! isset($assoc['inherited'])) {
                             foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
                                 if ($beginning) $beginning = false; else $sql .= ', ';
-                                
+
                                 $columnAlias = $this->getSQLColumnAlias($srcColumn);
                                 $sql .= $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias;
-                                
-                                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $srcColumn);
+
+                                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn);
                             }
                         }
                     }
@@ -1284,61 +1269,61 @@ class SqlWalker implements TreeWalker
     {
         $expr = $simpleSelectExpression->expression;
         $sql  = ' ';
-        
+
         switch (true) {
             case ($expr instanceof AST\PathExpression):
                 $sql .= $this->walkPathExpression($expr);
                 break;
-            
+
             case ($expr instanceof AST\AggregateExpression):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->_scalarResultCounter++;
-                
+
                 $sql .= $this->walkAggregateExpression($expr) . ' AS dctrn__' . $alias;
                 break;
-            
+
             case ($expr instanceof AST\Subselect):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->_scalarResultCounter++;
-                
+
                 $columnAlias = 'sclr' . $this->_aliasCounter++;
                 $this->_scalarResultAliasMap[$alias] = $columnAlias;
-                
+
                 $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
                 break;
-            
+
             case ($expr instanceof AST\Functions\FunctionNode):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->_scalarResultCounter++;
-                
-                $columnAlias = 'sclr' . $this->_aliasCounter++;
+
+                $columnAlias = $this->getSQLColumnAlias('sclr');
                 $this->_scalarResultAliasMap[$alias] = $columnAlias;
-                
+
                 $sql .= $this->walkFunction($expr) . ' AS ' . $columnAlias;
                 break;
-            
+
             case ($expr instanceof AST\SimpleArithmeticExpression):
             case ($expr instanceof AST\ArithmeticTerm):
             case ($expr instanceof AST\ArithmeticFactor):
             case ($expr instanceof AST\ArithmeticPrimary):
             case ($expr instanceof AST\Literal):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->_scalarResultCounter++;
-                
-                $columnAlias = 'sclr' . $this->_aliasCounter++;
+
+                $columnAlias = $this->getSQLColumnAlias('sclr');
                 $this->_scalarResultAliasMap[$alias] = $columnAlias;
-                
+
                 $sql .= $this->walkSimpleArithmeticExpression($expr) . ' AS ' . $columnAlias;
                 break;
-                
+
             case ($expr instanceof AST\NullIfExpression):
             case ($expr instanceof AST\CoalesceExpression):
             case ($expr instanceof AST\GeneralCaseExpression):
             case ($expr instanceof AST\SimpleCaseExpression):
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->_scalarResultCounter++;
-                
-                $columnAlias = 'sclr' . $this->_aliasCounter++;
+
+                $columnAlias = $this->getSQLColumnAlias('sclr');
                 $this->_scalarResultAliasMap[$alias] = $columnAlias;
-                
+
                 $sql .= $this->walkCaseExpression($expr) . ' AS ' . $columnAlias;
                 break;
-            
+
             default: // IdentificationVariable
                 $class      = $this->_queryComponents[$expr]['metadata'];
                 $tableAlias = $this->getSQLTableAlias($class->getTableName(), $expr);
@@ -1347,11 +1332,11 @@ class SqlWalker implements TreeWalker
                 foreach ($class->getQuotedIdentifierColumnNames($this->_platform) as $columnName) {
                     $sqlParts[] = $tableAlias . '.' . $columnName;
                 }
-                
+
                 $sql .= implode(', ', $sqlParts);
                 break;
         }
-        
+
         return $sql;
     }
 
@@ -1376,22 +1361,22 @@ class SqlWalker implements TreeWalker
     public function walkGroupByClause($groupByClause)
     {
         $sqlParts = array();
-        
+
         foreach ($groupByClause->groupByItems AS $groupByItem) {
             if ( ! is_string($groupByItem)) {
                 $sqlParts[] = $this->walkGroupByItem($groupByItem);
-                
+
                 continue;
             }
-            
+
             foreach ($this->_queryComponents[$groupByItem]['metadata']->identifier AS $idField) {
                 $groupByItem = new AST\PathExpression(AST\PathExpression::TYPE_STATE_FIELD, $groupByItem, $idField);
                 $groupByItem->type = AST\PathExpression::TYPE_STATE_FIELD;
-                
+
                 $sqlParts[] = $this->walkGroupByItem($groupByItem);
             }
         }
-        
+
         return ' GROUP BY ' . implode(', ', $sqlParts);
     }
 
@@ -1417,7 +1402,7 @@ class SqlWalker implements TreeWalker
         $class     = $this->_em->getClassMetadata($deleteClause->abstractSchemaName);
         $tableName = $class->getTableName();
         $sql       = 'DELETE FROM ' . $class->getQuotedTableName($this->_platform);
-        
+
         $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable);
         $this->_rootAliases[] = $deleteClause->aliasIdentificationVariable;
 
@@ -1435,7 +1420,7 @@ class SqlWalker implements TreeWalker
         $class     = $this->_em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
         $sql       = 'UPDATE ' . $class->getQuotedTableName($this->_platform);
-        
+
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->_rootAliases[] = $updateClause->aliasIdentificationVariable;
 
@@ -1462,11 +1447,11 @@ class SqlWalker implements TreeWalker
             case ($newValue instanceof AST\Node):
                 $sql .= $newValue->dispatch($this);
                 break;
-            
+
             case ($newValue === null):
                 $sql .= 'NULL';
                 break;
-            
+
             default:
                 $sql .= $this->_conn->quote($newValue);
                 break;
@@ -1491,8 +1476,8 @@ class SqlWalker implements TreeWalker
 
         if ($condSql) {
             return ' WHERE ' . (( ! $discrSql) ? $condSql : '(' . $condSql . ') AND ' . $discrSql);
-        } 
-        
+        }
+
         if ($discrSql) {
             return ' WHERE ' . $discrSql;
         }
@@ -1513,7 +1498,7 @@ class SqlWalker implements TreeWalker
         if ( ! ($condExpr instanceof AST\ConditionalExpression)) {
             return $this->walkConditionalTerm($condExpr);
         }
-        
+
         return implode(' OR ', array_map(array($this, 'walkConditionalTerm'), $condExpr->conditionalTerms));
     }
 
@@ -1530,7 +1515,7 @@ class SqlWalker implements TreeWalker
         if ( ! ($condTerm instanceof AST\ConditionalTerm)) {
             return $this->walkConditionalFactor($condTerm);
         }
-        
+
         return implode(' AND ', array_map(array($this, 'walkConditionalFactor'), $condTerm->conditionalFactors));
     }
 
@@ -1559,8 +1544,8 @@ class SqlWalker implements TreeWalker
     {
         if ($primary->isSimpleConditionalExpression()) {
             return $primary->simpleConditionalExpression->dispatch($this);
-        } 
-        
+        }
+
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
@@ -1595,12 +1580,12 @@ class SqlWalker implements TreeWalker
         $sql .= 'EXISTS (SELECT 1 FROM ';
         $entityExpr = $collMemberExpr->entityExpression;
         $collPathExpr = $collMemberExpr->collectionValuedPathExpression;
-        
+
         $fieldName = $collPathExpr->field;
         $dqlAlias = $collPathExpr->identificationVariable;
-        
+
         $class = $this->_queryComponents[$dqlAlias]['metadata'];
-        
+
         if ($entityExpr instanceof AST\InputParameter) {
             $dqlParamKey = $entityExpr->name;
             $entity = $this->_query->getParameter($dqlParamKey);
@@ -1608,39 +1593,39 @@ class SqlWalker implements TreeWalker
             //TODO
             throw new \BadMethodCallException("Not implemented");
         }
-        
+
         $assoc = $class->associationMappings[$fieldName];
-        
+
         if ($assoc['type'] == ClassMetadata::ONE_TO_MANY) {
             $targetClass      = $this->_em->getClassMetadata($assoc['targetEntity']);
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
-            
+
             $sql .= $targetClass->getQuotedTableName($this->_platform) . ' ' . $targetTableAlias . ' WHERE ';
-                    
+
             $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']];
             $first = true;
-            
+
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
                 if ($first) $first = false; else $sql .= ' AND ';
-                
-                $sql .= $sourceTableAlias . '.' . $class->getQuotedColumnName($class->fieldNames[$targetColumn], $this->_platform) 
-                      . ' = ' 
+
+                $sql .= $sourceTableAlias . '.' . $class->getQuotedColumnName($class->fieldNames[$targetColumn], $this->_platform)
+                      . ' = '
                       . $targetTableAlias . '.' . $sourceColumn;
             }
-            
+
             $sql .= ' AND ';
             $first = true;
-            
+
             foreach ($targetClass->getQuotedIdentifierColumnNames($this->_platform) as $targetColumnName) {
                 if ($first) $first = false; else $sql .= ' AND ';
-                
+
                 $this->_parserResult->addParameterMapping($dqlParamKey, $this->_sqlParamIndex++);
                 $sql .= $targetTableAlias . '.'  . $targetColumnName . ' = ?';
             }
         } else { // many-to-many
             $targetClass = $this->_em->getClassMetadata($assoc['targetEntity']);
-            
+
             $owningAssoc = $assoc['isOwningSide'] ? $assoc : $targetClass->associationMappings[$assoc['mappedBy']];
             $joinTable = $owningAssoc['joinTable'];
 
@@ -1648,11 +1633,11 @@ class SqlWalker implements TreeWalker
             $joinTableAlias   = $this->getSQLTableAlias($joinTable['name']);
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
-            
+
             // join to target table
-            $sql .= $targetClass->getQuotedJoinTableName($owningAssoc, $this->_platform) . ' ' . $joinTableAlias 
+            $sql .= $targetClass->getQuotedJoinTableName($owningAssoc, $this->_platform) . ' ' . $joinTableAlias
                   . ' INNER JOIN ' . $targetClass->getQuotedTableName($this->_platform) . ' ' . $targetTableAlias . ' ON ';
-            
+
             // join conditions
             $joinColumns = $assoc['isOwningSide']
                 ? $joinTable['inverseJoinColumns']
@@ -1670,20 +1655,20 @@ class SqlWalker implements TreeWalker
 
             $joinColumns = $assoc['isOwningSide'] ? $joinTable['joinColumns'] : $joinTable['inverseJoinColumns'];
             $first = true;
-            
+
             foreach ($joinColumns as $joinColumn) {
                 if ($first) $first = false; else $sql .= ' AND ';
 
-                $sql .= $joinTableAlias . '.' . $joinColumn['name'] . ' = ' 
+                $sql .= $joinTableAlias . '.' . $joinColumn['name'] . ' = '
                       . $sourceTableAlias . '.' . $class->getQuotedColumnName($class->fieldNames[$joinColumn['referencedColumnName']], $this->_platform);
             }
-            
+
             $sql .= ' AND ';
             $first = true;
-            
+
             foreach ($targetClass->getQuotedIdentifierColumnNames($this->_platform) as $targetColumnName) {
                 if ($first) $first = false; else $sql .= ' AND ';
-                
+
                 $this->_parserResult->addParameterMapping($dqlParamKey, $this->_sqlParamIndex++);
                 $sql .= $targetTableAlias . '.' . $targetColumnName . ' = ?';
             }
@@ -1691,7 +1676,7 @@ class SqlWalker implements TreeWalker
 
         return $sql . ')';
     }
-    
+
     /**
      * Walks down an EmptyCollectionComparisonExpression AST node, thereby generating the appropriate SQL.
      *
@@ -1738,10 +1723,10 @@ class SqlWalker implements TreeWalker
      */
     public function walkInExpression($inExpr)
     {
-        $sql = $this->walkPathExpression($inExpr->pathExpression) 
+        $sql = $this->walkPathExpression($inExpr->pathExpression)
              . ($inExpr->not ? ' NOT' : '') . ' IN (';
 
-        $sql .= ($inExpr->subselect) 
+        $sql .= ($inExpr->subselect)
             ? $this->walkSubselect($inExpr->subselect)
             : implode(', ', array_map(array($this, 'walkInParameter'), $inExpr->literals));
 
@@ -1771,11 +1756,11 @@ class SqlWalker implements TreeWalker
         if ($this->_useSqlTableAliases) {
             $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias) . '.';
         }
-        
+
         $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
-        
+
         $sqlParameterList = array();
-        
+
         foreach ($instanceOfExpr->value as $parameter) {
             if ($parameter instanceof AST\InputParameter) {
                 // We need to modify the parameter value to be its correspondent mapped value
@@ -1796,7 +1781,7 @@ class SqlWalker implements TreeWalker
                 $sqlParameterList[] = $this->_conn->quote($class->discriminatorValue);
             } else {
                 $discrMap = array_flip($class->discriminatorMap);
-                
+
                 if (!isset($discrMap[$entityClassName])) {
                     throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName);
                 }
@@ -1804,7 +1789,7 @@ class SqlWalker implements TreeWalker
                 $sqlParameterList[] = $this->_conn->quote($discrMap[$entityClassName]);
             }
         }
-        
+
         $sql .= '(' . implode(', ', $sqlParameterList) . ')';
 
         return $sql;
@@ -1818,8 +1803,8 @@ class SqlWalker implements TreeWalker
      */
     public function walkInParameter($inParam)
     {
-        return $inParam instanceof AST\InputParameter 
-            ? $this->walkInputParameter($inParam) 
+        return $inParam instanceof AST\InputParameter
+            ? $this->walkInputParameter($inParam)
             : $this->walkLiteral($inParam);
     }
 
@@ -1834,16 +1819,16 @@ class SqlWalker implements TreeWalker
         switch ($literal->type) {
             case AST\Literal::STRING:
                 return $this->_conn->quote($literal->value);
-                
+
             case AST\Literal::BOOLEAN:
                 $bool = strtolower($literal->value) == 'true' ? true : false;
                 $boolVal = $this->_conn->getDatabasePlatform()->convertBooleans($bool);
-                
+
                 return $boolVal;
-                
+
             case AST\Literal::NUMERIC:
                 return $literal->value;
-                
+
             default:
                 throw QueryException::invalidLiteral($literal);
         }
@@ -1916,14 +1901,14 @@ class SqlWalker implements TreeWalker
         $leftExpr  = $compExpr->leftExpression;
         $rightExpr = $compExpr->rightExpression;
         $sql       = '';
-        
-        $sql .= ($leftExpr instanceof AST\Node) 
+
+        $sql .= ($leftExpr instanceof AST\Node)
             ? $leftExpr->dispatch($this)
             : (is_numeric($leftExpr) ? $leftExpr : $this->_conn->quote($leftExpr));
 
         $sql .= ' ' . $compExpr->operator . ' ';
 
-        $sql .= ($rightExpr instanceof AST\Node) 
+        $sql .= ($rightExpr instanceof AST\Node)
             ? $rightExpr->dispatch($this)
             : (is_numeric($rightExpr) ? $rightExpr : $this->_conn->quote($rightExpr));
 
@@ -1967,7 +1952,7 @@ class SqlWalker implements TreeWalker
         if ( ! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
             return $this->walkArithmeticTerm($simpleArithmeticExpr);
         }
-        
+
         return implode(' ', array_map(array($this, 'walkArithmeticTerm'), $simpleArithmeticExpr->arithmeticTerms));
     }
 
@@ -1980,7 +1965,7 @@ class SqlWalker implements TreeWalker
     public function walkArithmeticTerm($term)
     {
         if (is_string($term)) {
-            return (isset($this->_queryComponents[$term])) 
+            return (isset($this->_queryComponents[$term]))
                 ? $this->_scalarResultAliasMap[$this->_queryComponents[$term]['token']['value']]
                 : $term;
         }
@@ -1990,7 +1975,7 @@ class SqlWalker implements TreeWalker
         if ( ! ($term instanceof AST\ArithmeticTerm)) {
             return $this->walkArithmeticFactor($term);
         }
-        
+
         return implode(' ', array_map(array($this, 'walkArithmeticFactor'), $term->arithmeticFactors));
     }
 
@@ -2005,15 +1990,15 @@ class SqlWalker implements TreeWalker
         if (is_string($factor)) {
             return $factor;
         }
-        
+
         // Phase 2 AST optimization: Skip processment of ArithmeticFactor
         // if only one ArithmeticPrimary is defined
         if ( ! ($factor instanceof AST\ArithmeticFactor)) {
             return $this->walkArithmeticPrimary($factor);
         }
-        
+
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
-        
+
         return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
@@ -2027,8 +2012,8 @@ class SqlWalker implements TreeWalker
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
             return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
-        } 
-        
+        }
+
         if ($primary instanceof AST\Node) {
             return $primary->dispatch($this);
         }
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
index 77106ec7d..568a960a4 100644
--- a/lib/Doctrine/ORM/Tools/SchemaTool.php
+++ b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -67,7 +67,9 @@ class SchemaTool
     /**
      * Creates the database schema for the given array of ClassMetadata instances.
      *
+     * @throws ToolsException
      * @param array $classes
+     * @return void
      */
     public function createSchema(array $classes)
     {
@@ -75,7 +77,11 @@ class SchemaTool
         $conn = $this->_em->getConnection();
 
         foreach ($createSchemaSql as $sql) {
-            $conn->executeQuery($sql);
+            try {
+                $conn->executeQuery($sql);
+            } catch(\Exception $e) {
+                throw ToolsException::schemaToolFailure($sql, $e);
+            }
         }
     }
 
@@ -94,7 +100,7 @@ class SchemaTool
 
     /**
      * Some instances of ClassMetadata don't need to be processed in the SchemaTool context. This method detects them.
-     * 
+     *
      * @param ClassMetadata $class
      * @param array $processedClasses
      * @return bool
@@ -551,7 +557,7 @@ class SchemaTool
             try {
                 $conn->executeQuery($sql);
             } catch(\Exception $e) {
-                
+
             }
         }
     }
@@ -589,7 +595,7 @@ class SchemaTool
 
     /**
      * Get SQL to drop the tables defined by the passed classes.
-     * 
+     *
      * @param array $classes
      * @return array
      */
@@ -615,7 +621,7 @@ class SchemaTool
                 }
             }
         }
-        
+
         if ($this->_platform->supportsSequences()) {
             foreach ($schema->getSequences() AS $sequence) {
                 $visitor->acceptSequence($sequence);
@@ -659,7 +665,7 @@ class SchemaTool
     /**
      * Gets the sequence of SQL statements that need to be performed in order
      * to bring the given class mappings in-synch with the relational schema.
-     * If $saveMode is set to true the command is executed in the Database, 
+     * If $saveMode is set to true the command is executed in the Database,
      * else SQL is returned.
      *
      * @param array $classes The classes to consider.
diff --git a/lib/Doctrine/ORM/Tools/ToolsException.php b/lib/Doctrine/ORM/Tools/ToolsException.php
index f7ed87105..4551d87da 100644
--- a/lib/Doctrine/ORM/Tools/ToolsException.php
+++ b/lib/Doctrine/ORM/Tools/ToolsException.php
@@ -1,11 +1,38 @@
 <?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
 
 namespace Doctrine\ORM\Tools;
 
 use Doctrine\ORM\ORMException;
 
+/**
+ * Tools related Exceptions
+ *
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
+ */
 class ToolsException extends ORMException
 {
+    public static function schemaToolFailure($sql, \Exception $e)
+    {
+        return new self("Schema-Tool failed with Error '" . $e->getMessage() . "' while executing DDL: " . $sql, "0", $e);
+    }
+
     public static function couldNotMapDoctrine1Type($type)
     {
         return new self("Could not map doctrine 1 type '$type'!");
diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php
index f4f5e1fcb..3e3deedb1 100644
--- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php
+++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php
@@ -21,7 +21,7 @@ class LegacyUser
      */
     public $_username;
     /**
-     * @Column(type="string", length=255)
+     * @Column(type="string", length=255, name="name")
      */
     public $_name;
     /**
diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php
index c6cd891a1..e666ae196 100644
--- a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php
+++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php
@@ -23,12 +23,12 @@ class LegacyUserReference
     private $_target;
 
     /**
-     * @column(type="string")
+     * @column(type="string", name="description")
      */
     private $_description;
 
     /**
-     * @column(type="datetime")
+     * @column(type="datetime", name="created")
      */
     private $_created;
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomTreeWalkersTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomTreeWalkersTest.php
index ada41d00b..72fc6d587 100644
--- a/tests/Doctrine/Tests/ORM/Functional/CustomTreeWalkersTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/CustomTreeWalkersTest.php
@@ -1,7 +1,5 @@
 <?php
 /*
- *  $Id$
- *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -33,11 +31,13 @@ require_once __DIR__ . '/../../TestInit.php';
  * @link        http://www.doctrine-project.org
  * @since       2.0
  */
-class CustomTreeWalkersTest extends \Doctrine\Tests\OrmFunctionalTestCase
+class CustomTreeWalkersTest extends \Doctrine\Tests\OrmTestCase
 {
-    protected function setUp() {
-        $this->useModelSet('cms');
-        parent::setUp();
+    private $_em;
+
+    protected function setUp()
+    {
+        $this->_em = $this->_getTestEntityManager();
     }
 
     public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed)
@@ -70,7 +70,7 @@ class CustomTreeWalkersTest extends \Doctrine\Tests\OrmFunctionalTestCase
             "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, c0_.email_id AS email_id4 FROM cms_users c0_ WHERE (c0_.name = ? OR c0_.name = ?) AND c0_.id = 1"
         );
     }
-    
+
     public function testSupportsQueriesWithSimpleConditionalExpression()
     {
         $this->assertSqlGeneration(
@@ -94,7 +94,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
                 $dqlAliases[] = $dqlAlias;
             }
         }
-        
+
         // Create our conditions for all involved classes
         $factors = array();
         foreach ($dqlAliases as $alias) {
@@ -108,7 +108,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
             $factor = new Query\AST\ConditionalFactor($condPrimary);
             $factors[] = $factor;
         }
-        
+
         if (($whereClause = $selectStatement->whereClause) !== null) {
             // There is already a WHERE clause, so append the conditions
             $condExpr = $whereClause->conditionalExpression;
@@ -119,18 +119,18 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter
 
                 $whereClause->conditionalExpression = $condExpr;
             }
-            
+
             $existingTerms = $whereClause->conditionalExpression->conditionalTerms;
-            
+
             if (count($existingTerms) > 1) {
                 // More than one term, so we need to wrap all these terms in a single root term
                 // i.e: "WHERE u.name = :foo or u.other = :bar" => "WHERE (u.name = :foo or u.other = :bar) AND <our condition>"
-                
+
                 $primary = new Query\AST\ConditionalPrimary;
                 $primary->conditionalExpression = new Query\AST\ConditionalExpression($existingTerms);
                 $existingFactor = new Query\AST\ConditionalFactor($primary);
                 $term = new Query\AST\ConditionalTerm(array_merge(array($existingFactor), $factors));
-                
+
                 $selectStatement->whereClause->conditionalExpression->conditionalTerms = array($term);
             } else {
                 // Just one term so we can simply append our factors to that term
diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
index 3c41e0201..eb46329f1 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
@@ -35,7 +35,7 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $user->status = 'dev';
         $this->_em->persist($user);
         $this->_em->flush();
-        
+
         $this->_em->clear();
 
         $rsm = new ResultSetMapping;
@@ -94,24 +94,24 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals($addr->street, $addresses[0]->street);
         $this->assertTrue($addresses[0]->user instanceof CmsUser);
     }
-    
+
     public function testJoinedOneToManyNativeQuery()
     {
         $user = new CmsUser;
         $user->name = 'Roman';
         $user->username = 'romanb';
         $user->status = 'dev';
-        
+
         $phone = new CmsPhonenumber;
         $phone->phonenumber = 424242;
-        
+
         $user->addPhonenumber($phone);
-        
+
         $this->_em->persist($user);
         $this->_em->flush();
-        
+
         $this->_em->clear();
-        
+
         $rsm = new ResultSetMapping;
         $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
         $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id');
@@ -119,7 +119,7 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('status'), 'status');
         $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p', 'u', 'phonenumbers');
         $rsm->addFieldResult('p', $this->platform->getSQLResultCasing('phonenumber'), 'phonenumber');
-        
+
         $query = $this->_em->createNativeQuery('SELECT id, name, status, phonenumber FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', $rsm);
         $query->setParameter(1, 'romanb');
 
@@ -133,30 +133,30 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $phones = $users[0]->getPhonenumbers();
         $this->assertEquals(424242, $phones[0]->phonenumber);
         $this->assertTrue($phones[0]->getUser() === $users[0]);
-        
+
     }
-    
+
     public function testJoinedOneToOneNativeQuery()
     {
         $user = new CmsUser;
         $user->name = 'Roman';
         $user->username = 'romanb';
         $user->status = 'dev';
-        
+
         $addr = new CmsAddress;
         $addr->country = 'germany';
         $addr->zip = 10827;
         $addr->city = 'Berlin';
-        
-        
+
+
         $user->setAddress($addr);
-        
+
         $this->_em->persist($user);
         $this->_em->flush();
-        
+
         $this->_em->clear();
-        
-        
+
+
         $rsm = new ResultSetMapping;
         $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
         $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id');
@@ -167,12 +167,12 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('country'), 'country');
         $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('zip'), 'zip');
         $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('city'), 'city');
-        
+
         $query = $this->_em->createNativeQuery('SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm);
         $query->setParameter(1, 'romanb');
-        
+
         $users = $query->getResult();
-        
+
         $this->assertEquals(1, count($users));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]);
         $this->assertEquals('Roman', $users[0]->name);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
index 8a5819956..44832fc76 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
@@ -27,14 +27,14 @@ class ReadOnlyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
 
         $readOnly->name = "Test2";
-        $readOnly->number = 4321;
+        $readOnly->numericValue = 4321;
 
         $this->_em->flush();
         $this->_em->clear();
 
         $dbReadOnly = $this->_em->find('Doctrine\Tests\ORM\Functional\ReadOnlyEntity', $readOnly->id);
         $this->assertEquals("Test1", $dbReadOnly->name);
-        $this->assertEquals(1234, $dbReadOnly->number);
+        $this->assertEquals(1234, $dbReadOnly->numericValue);
     }
 }
 
@@ -51,11 +51,11 @@ class ReadOnlyEntity
     /** @column(type="string") */
     public $name;
     /** @Column(type="integer") */
-    public $number;
+    public $numericValue;
 
     public function __construct($name, $number)
     {
         $this->name = $name;
-        $this->number = $number;
+        $this->numericValue = $number;
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
index 21a042187..93dc0eea6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
@@ -24,7 +24,7 @@ class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $user->name = "John Galt";
         $user->username = "jgalt";
         $user->status = "inactive";
-        
+
         $article = new CmsArticle();
         $article->topic = "This is John Galt speaking!";
         $article->text = "Yadda Yadda!";
@@ -44,11 +44,10 @@ class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase
                   ->setParameter('author', $user)
                   ->getResult();
 
-        $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = :topic AND a.user = :author AND a.user = :author  AND a.text = :text";
+        $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = :topic AND a.user = :author AND a.user = :author";
         $farticle = $this->_em->createQuery($dql)
                   ->setParameter('author', $user)
                   ->setParameter('topic', 'This is John Galt speaking!')
-                  ->setParameter('text', 'Yadda Yadda!')
                   ->getSingleResult();
 
         $this->assertSame($article, $farticle);
@@ -70,12 +69,11 @@ class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->persist($article);
         $this->_em->flush();
 
-        $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = ?1 AND a.user = ?2 AND a.user = ?3 AND a.text = ?4";
+        $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = ?1 AND a.user = ?2 AND a.user = ?3";
         $farticle = $this->_em->createQuery($dql)
                   ->setParameter(1, 'This is John Galt speaking!')
                   ->setParameter(2, $user)
                   ->setParameter(3, $user)
-                  ->setParameter(4, 'Yadda Yadda!')
                   ->getSingleResult();
 
         $this->assertSame($article, $farticle);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
index 472978bc2..bddbbdf44 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
@@ -106,7 +106,7 @@ class DDC1209_3
 {
     /**
      * @Id
-     * @Column(type="datetime")
+     * @Column(type="datetime", name="somedate")
      */
     private $date;
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
index cec258f37..95dcc2b65 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
@@ -21,10 +21,10 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity2'),
             ));
         } catch(\PDOException $e) {
-            
+
         }
     }
-    
+
     public function testIssue()
     {
         $qb = $this->_em->createQueryBuilder();
@@ -32,10 +32,10 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase
            ->select('te1')
            ->where('te1.testEntity2 = ?1')
            ->setParameter(1, 0);
-        
+
         $this->assertEquals(
-            'SELECT t0_.test_entity2_id AS test_entity2_id0 FROM te1 t0_ WHERE t0_.test_entity2_id = ?',
-            $qb->getQuery()->getSQL()
+            strtolower('SELECT t0_.test_entity2_id AS test_entity2_id0 FROM te1 t0_ WHERE t0_.test_entity2_id = ?'),
+            strtolower($qb->getQuery()->getSQL())
         );
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
index 34aef78cf..6e14e2111 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
@@ -21,58 +21,58 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'),
             ));
-        } catch(\PDOException $e) {
-            
+        } catch(\Exception $e) {
+
         }
     }
-    
+
     public function testOneToOnePersist()
     {
         $user = new DDC1228User;
         $profile = new DDC1228Profile();
         $profile->name = "Foo";
         $user->profile = $profile;
-        
+
         $this->_em->persist($user);
         $this->_em->persist($profile);
         $this->_em->flush();
         $this->_em->clear();
-        
+
         $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
-        
+
         $this->assertFalse($user->getProfile()->__isInitialized__, "Proxy is not initialized");
         $user->getProfile()->setName("Bar");
         $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized");
-        
+
         $this->assertEquals("Bar", $user->getProfile()->getName());
         $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile()));
-        
+
         $this->_em->flush();
         $this->_em->clear();
-        
+
         $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
         $this->assertEquals("Bar", $user->getProfile()->getName());
     }
-    
+
     public function testRefresh()
     {
         $user = new DDC1228User;
         $profile = new DDC1228Profile();
         $profile->name = "Foo";
         $user->profile = $profile;
-        
+
         $this->_em->persist($user);
         $this->_em->persist($profile);
         $this->_em->flush();
         $this->_em->clear();
-        
+
         $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1228User', $user->id);
-        
+
         $this->_em->refresh($user);
         $user->name = "Baz";
         $this->_em->flush();
         $this->_em->clear();
-        
+
         $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
         $this->assertEquals("Baz", $user->name);
     }
@@ -88,20 +88,20 @@ class DDC1228User
      * @var int
      */
     public $id;
-    
+
     /**
-     * @column(type="string")
+     * @Column(type="string")
      * @var string
      */
-    public $name = '';
-    
+    public $name = 'Bar';
+
     /**
      * @OneToOne(targetEntity="DDC1228Profile")
      * @var Profile
      */
     public $profile;
-    
-    public function getProfile()   
+
+    public function getProfile()
     {
         return $this->profile;
     }
@@ -117,13 +117,13 @@ class DDC1228Profile
      * @var int
      */
     public $id;
-    
+
     /**
      * @column(type="string")
      * @var string
      */
     public $name;
-    
+
     public function getName()
     {
         return $this->name;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
index 467577a43..6783928ef 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
@@ -19,49 +19,49 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase
             $this->_schemaTool->createSchema(array(
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'),
             ));
-        } catch(\PDOException $e) {
-            
+        } catch(\Exception $e) {
+
         }
     }
-    
+
     public function testIssue()
     {
         $user = new DDC1238User;
         $user->setName("test");
-        
+
         $this->_em->persist($user);
         $this->_em->flush();
         $this->_em->clear();
-        
+
         $userId = $user->getId();
         $this->_em->clear();
-        
+
         $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId);
         $this->_em->clear();
-        
+
         $userId2 = $user->getId();
         $this->assertEquals($userId, $userId2, "This proxy can still be initialized.");
     }
-    
+
     public function testIssueProxyClear()
     {
         $user = new DDC1238User;
         $user->setName("test");
-        
+
         $this->_em->persist($user);
         $this->_em->flush();
         $this->_em->clear();
-        
+
         // force proxy load, getId() doesn't work anymore
         $user->getName();
         $userId = $user->getId();
         $this->_em->clear();
-        
+
         $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId);
         $this->_em->clear();
-        
+
         $user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId);
-        
+
         // force proxy load, getId() doesn't work anymore
         $user->getName();
         $this->assertNull($user->getId(), "Now this is null, we already have a user instance of that type");
@@ -75,18 +75,18 @@ class DDC1238User
 {
     /** @Id @GeneratedValue @Column(type="integer") */
     private $id;
-    
+
     /**
      * @Column
      * @var string
      */
     private $name;
-    
+
     public function getId()
     {
         return $this->id;
     }
-    
+
     public function getName()
     {
         return $this->name;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
index e12ee9ab7..e283b9f1c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
@@ -7,56 +7,56 @@ use DateTime;
 require_once __DIR__ . '/../../../TestInit.php';
 
 /**
- * @group DDC-1135
+ * @group DDC-1335
  */
-class DDC1135Test extends \Doctrine\Tests\OrmFunctionalTestCase
+class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
     {
         parent::setUp();
         try {
             $this->_schemaTool->createSchema(array(
-                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1135User'),
-                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1135Phone'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335User'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335Phone'),
             ));
             $this->loadFixture();
         } catch(\Exception $e) {
         }
     }
-    
-   
+
+
     public function testDql()
     {
-        $dql      = 'SELECT u FROM ' . __NAMESPACE__ . '\DDC1135User u INDEX BY u.id';
+        $dql      = 'SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id';
         $query    = $this->_em->createQuery($dql);
         $result   = $query->getResult();
-        
+
         $this->assertEquals(sizeof($result), 3);
         $this->assertArrayHasKey(1, $result);
         $this->assertArrayHasKey(2, $result);
         $this->assertArrayHasKey(3, $result);
-        
-        $dql      = 'SELECT u, p FROM '.__NAMESPACE__ . '\DDC1135User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id';
+
+        $dql      = 'SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id';
         $query    = $this->_em->createQuery($dql);
         $result   = $query->getResult();
-        
+
         $this->assertEquals(sizeof($result), 3);
         $this->assertArrayHasKey('foo@foo.com', $result);
         $this->assertArrayHasKey('bar@bar.com', $result);
         $this->assertArrayHasKey('foobar@foobar.com', $result);
-        
+
         $this->assertEquals(sizeof($result['foo@foo.com']->phones), 3);
         $this->assertEquals(sizeof($result['bar@bar.com']->phones), 3);
         $this->assertEquals(sizeof($result['foobar@foobar.com']->phones), 3);
-        
+
         $this->assertArrayHasKey(1, $result['foo@foo.com']->phones->toArray());
         $this->assertArrayHasKey(2, $result['foo@foo.com']->phones->toArray());
         $this->assertArrayHasKey(3, $result['foo@foo.com']->phones->toArray());
-        
+
         $this->assertArrayHasKey(4, $result['bar@bar.com']->phones->toArray());
         $this->assertArrayHasKey(5, $result['bar@bar.com']->phones->toArray());
         $this->assertArrayHasKey(6, $result['bar@bar.com']->phones->toArray());
-        
+
         $this->assertArrayHasKey(7, $result['foobar@foobar.com']->phones->toArray());
         $this->assertArrayHasKey(8, $result['foobar@foobar.com']->phones->toArray());
         $this->assertArrayHasKey(9, $result['foobar@foobar.com']->phones->toArray());
@@ -65,77 +65,77 @@ class DDC1135Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testTicket()
     {
         $builder = $this->_em->createQueryBuilder();
-        $builder->select('u')->from(__NAMESPACE__ . '\DDC1135User', 'u', 'u.id');
+        $builder->select('u')->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.id');
 
         $dql    = $builder->getQuery()->getDQL();
         $result = $builder->getQuery()->getResult();
-        
+
         $this->assertEquals(sizeof($result), 3);
         $this->assertArrayHasKey(1, $result);
         $this->assertArrayHasKey(2, $result);
         $this->assertArrayHasKey(3, $result);
-        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1135User u INDEX BY u.id', $dql);
+        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id', $dql);
     }
-    
+
     public function testIndexByUnique()
     {
         $builder = $this->_em->createQueryBuilder();
-        $builder->select('u')->from(__NAMESPACE__ . '\DDC1135User', 'u', 'u.email');
+        $builder->select('u')->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.email');
 
         $dql    = $builder->getQuery()->getDQL();
         $result = $builder->getQuery()->getResult();
-        
+
         $this->assertEquals(sizeof($result), 3);
         $this->assertArrayHasKey('foo@foo.com', $result);
         $this->assertArrayHasKey('bar@bar.com', $result);
         $this->assertArrayHasKey('foobar@foobar.com', $result);
-        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1135User u INDEX BY u.email', $dql);
+        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.email', $dql);
     }
-    
+
     public function  testIndexWithJoin()
     {
         $builder = $this->_em->createQueryBuilder();
         $builder->select('u','p')
-                ->from(__NAMESPACE__ . '\DDC1135User', 'u', 'u.email')
+                ->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.email')
                 ->join('u.phones', 'p', null, null, 'p.id');
-        
+
         $dql    = $builder->getQuery()->getDQL();
         $result = $builder->getQuery()->getResult();
-        
+
         $this->assertEquals(sizeof($result), 3);
         $this->assertArrayHasKey('foo@foo.com', $result);
         $this->assertArrayHasKey('bar@bar.com', $result);
         $this->assertArrayHasKey('foobar@foobar.com', $result);
-        
+
         $this->assertEquals(sizeof($result['foo@foo.com']->phones), 3);
         $this->assertEquals(sizeof($result['bar@bar.com']->phones), 3);
         $this->assertEquals(sizeof($result['foobar@foobar.com']->phones), 3);
-        
+
         $this->assertArrayHasKey(1, $result['foo@foo.com']->phones->toArray());
         $this->assertArrayHasKey(2, $result['foo@foo.com']->phones->toArray());
         $this->assertArrayHasKey(3, $result['foo@foo.com']->phones->toArray());
-        
+
         $this->assertArrayHasKey(4, $result['bar@bar.com']->phones->toArray());
         $this->assertArrayHasKey(5, $result['bar@bar.com']->phones->toArray());
         $this->assertArrayHasKey(6, $result['bar@bar.com']->phones->toArray());
-        
+
         $this->assertArrayHasKey(7, $result['foobar@foobar.com']->phones->toArray());
         $this->assertArrayHasKey(8, $result['foobar@foobar.com']->phones->toArray());
         $this->assertArrayHasKey(9, $result['foobar@foobar.com']->phones->toArray());
-        
-        $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__ . '\DDC1135User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql);
+
+        $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql);
     }
-    
+
     private function loadFixture()
     {
         $p1 = array('11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz');
         $p2 = array('22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz');
         $p3 = array('33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz');
-        
-        $u1 = new DDC1135User("foo@foo.com", "Foo",$p1);
-        $u2 = new DDC1135User("bar@bar.com", "Bar",$p2);
-        $u3 = new DDC1135User("foobar@foobar.com", "Foo Bar",$p3);
-        
+
+        $u1 = new DDC1335User("foo@foo.com", "Foo",$p1);
+        $u2 = new DDC1335User("bar@bar.com", "Bar",$p2);
+        $u3 = new DDC1335User("foobar@foobar.com", "Foo Bar",$p3);
+
         $this->_em->persist($u1);
         $this->_em->persist($u2);
         $this->_em->persist($u3);
@@ -148,7 +148,7 @@ class DDC1135Test extends \Doctrine\Tests\OrmFunctionalTestCase
 /**
  * @Entity
  */
-class DDC1135User
+class DDC1335User
 {
     /**
      * @Id @Column(type="integer")
@@ -160,25 +160,25 @@ class DDC1135User
      * @Column(type="string", unique=true)
      */
     public $email;
-    
+
     /**
      * @Column(type="string")
      */
     public $name;
-    
+
     /**
-     * @OneToMany(targetEntity="DDC1135Phone", mappedBy="user", cascade={"persist", "remove"})
+     * @OneToMany(targetEntity="DDC1335Phone", mappedBy="user", cascade={"persist", "remove"})
      */
     public $phones;
-    
+
     public function __construct($email, $name, array $numbers = array())
     {
         $this->name   = $name;
         $this->email  = $email;
         $this->phones = new \Doctrine\Common\Collections\ArrayCollection();
-        
+
         foreach ($numbers as $number) {
-            $this->phones->add(new DDC1135Phone($this,$number));
+            $this->phones->add(new DDC1335Phone($this,$number));
         }
     }
 }
@@ -186,22 +186,22 @@ class DDC1135User
 /**
  * @Entity
  */
-class DDC1135Phone
+class DDC1335Phone
 {
     /**
      * @Id
      * @Column(name="id", type="integer")
-     * @GeneratedValue(strategy="AUTO")
+     * @GeneratedValue
      */
     public $id;
 
     /**
-     * @Column(name="number", type="string", nullable = false)
+     * @Column(name="numericalValue", type="string", nullable = false)
      */
-    public $number;
+    public $numericalValue;
 
     /**
-     * @ManyToOne(targetEntity="DDC1135User", inversedBy="phones")
+     * @ManyToOne(targetEntity="DDC1335User", inversedBy="phones")
      * @JoinColumn(name="user_id", referencedColumnName="id", nullable = false)
      */
     public $user;
@@ -209,6 +209,6 @@ class DDC1135Phone
     public function __construct($user, $number)
     {
         $this->user     = $user;
-        $this->number   = $number;
+        $this->numericalValue   = $number;
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
index 512b1c9ea..2db32b9b8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
@@ -25,18 +25,15 @@ class DDC331Test extends \Doctrine\Tests\OrmFunctionalTestCase
         parent::setUp();
     }
 
+    /**
+     * @group DDC-331
+     */
     public function testSelectFieldOnRootEntity()
     {
-        $employee = new CompanyEmployee;
-        $employee->setName('Roman S. Borschel');
-        $employee->setSalary(100000);
-        $employee->setDepartment('IT');
-
-        $this->_em->persist($employee);
-        $this->_em->flush();
-        $this->_em->clear();
-
         $q = $this->_em->createQuery('SELECT e.name FROM Doctrine\Tests\Models\Company\CompanyEmployee e');
-        $this->assertEquals('SELECT c0_.name AS name0 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id', $q->getSql());
+        $this->assertEquals(
+            strtolower('SELECT c0_.name AS name0 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id'),
+            strtolower($q->getSql())
+        );
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
index f0867f352..4ea830863 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
@@ -18,7 +18,10 @@ class DDC448Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testIssue()
     {
         $q = $this->_em->createQuery("select b from ".__NAMESPACE__."\\DDC448SubTable b where b.connectedClassId = ?1");
-        $this->assertEquals('SELECT d0_.id AS id0, d0_.discr AS discr1, d0_.connectedClassId AS connectedClassId2 FROM SubTable s1_ INNER JOIN DDC448MainTable d0_ ON s1_.id = d0_.id WHERE d0_.connectedClassId = ?', $q->getSQL());
+        $this->assertEquals(
+            strtolower('SELECT d0_.id AS id0, d0_.discr AS discr1, d0_.connectedClassId AS connectedClassId2 FROM SubTable s1_ INNER JOIN DDC448MainTable d0_ ON s1_.id = d0_.id WHERE d0_.connectedClassId = ?'),
+            strtolower($q->getSQL())
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
index 25f378255..9e8d58be9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
@@ -18,7 +18,10 @@ class DDC493Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testIssue()
     {
         $q = $this->_em->createQuery("select u, c.data from ".__NAMESPACE__."\\DDC493Distributor u JOIN u.contact c");
-        $this->assertEquals('SELECT d0_.id AS id0, d1_.data AS data1, d0_.discr AS discr2, d0_.contact AS contact3 FROM DDC493Distributor d2_ INNER JOIN DDC493Customer d0_ ON d2_.id = d0_.id INNER JOIN DDC493Contact d1_ ON d0_.contact = d1_.id', $q->getSQL());
+        $this->assertEquals(
+            strtolower('SELECT d0_.id AS id0, d1_.data AS data1, d0_.discr AS discr2, d0_.contact AS contact3 FROM DDC493Distributor d2_ INNER JOIN DDC493Customer d0_ ON d2_.id = d0_.id INNER JOIN DDC493Contact d1_ ON d0_.contact = d1_.id'),
+            strtolower($q->getSQL())
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
index 125f297db..b71d674cc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
@@ -18,7 +18,10 @@ class DDC513Test extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testIssue()
     {
         $q = $this->_em->createQuery("select u from ".__NAMESPACE__."\\DDC513OfferItem u left join u.price p");
-        $this->assertEquals('SELECT d0_.id AS id0, d0_.discr AS discr1, d0_.price AS price2 FROM DDC513OfferItem d1_ INNER JOIN DDC513Item d0_ ON d1_.id = d0_.id LEFT JOIN DDC513Price d2_ ON d0_.price = d2_.id', $q->getSQL());
+        $this->assertEquals(
+            strtolower('SELECT d0_.id AS id0, d0_.discr AS discr1, d0_.price AS price2 FROM DDC513OfferItem d1_ INNER JOIN DDC513Item d0_ ON d1_.id = d0_.id LEFT JOIN DDC513Price d2_ ON d0_.price = d2_.id'),
+            strtolower($q->getSQL())
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
index 9fbfd01ab..4786cc176 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
@@ -30,7 +30,10 @@ class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $sql = $qb->getQuery()->getSQL();
 
-        $this->assertEquals('SELECT p0_.privilegeID AS privilegeID0, p0_.name AS name1, r1_.roleID AS roleID2, r1_.name AS name3, r1_.shortName AS shortName4 FROM Privileges p0_ LEFT JOIN RolePrivileges r2_ ON p0_.privilegeID = r2_.privilegeID LEFT JOIN Roles r1_ ON r1_.roleID = r2_.roleID', $sql);
+        $this->assertEquals(
+            strtolower('SELECT p0_.privilegeID AS privilegeID0, p0_.name AS name1, r1_.roleID AS roleID2, r1_.name AS name3, r1_.shortName AS shortName4 FROM Privileges p0_ LEFT JOIN RolePrivileges r2_ ON p0_.privilegeID = r2_.privilegeID LEFT JOIN Roles r1_ ON r1_.roleID = r2_.roleID'),
+            strtolower($sql)
+        );
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
index 82cb67223..6bd18ef98 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
@@ -19,7 +19,10 @@ class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         $q = $this->_em->createQuery('SELECT g, c FROM Doctrine\Tests\ORM\Functional\Ticket\DDC719Group g LEFT JOIN g.children c  WHERE g.parents IS EMPTY');
 
-        $this->assertEquals('SELECT g0_.name AS name0, g0_.description AS description1, g0_.id AS id2, g1_.name AS name3, g1_.description AS description4, g1_.id AS id5 FROM groups g0_ LEFT JOIN groups_groups g2_ ON g0_.id = g2_.parent_id LEFT JOIN groups g1_ ON g1_.id = g2_.child_id WHERE (SELECT COUNT(*) FROM groups_groups g3_ WHERE g3_.child_id = g0_.id) = 0', $q->getSQL());
+        $this->assertEquals(
+            strtolower('SELECT g0_.name AS name0, g0_.description AS description1, g0_.id AS id2, g1_.name AS name3, g1_.description AS description4, g1_.id AS id5 FROM groups g0_ LEFT JOIN groups_groups g2_ ON g0_.id = g2_.parent_id LEFT JOIN groups g1_ ON g1_.id = g2_.child_id WHERE (SELECT COUNT(*) FROM groups_groups g3_ WHERE g3_.child_id = g0_.id) = 0'),
+            strtolower($q->getSQL())
+        );
     }
 }
 
@@ -28,12 +31,12 @@ class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase
  */
 class Entity
 {
-    /** 
+    /**
      * @Id @GeneratedValue
-     * @Column(type="integer") 
+     * @Column(type="integer")
      */
     protected $id;
-    
+
     public function getId() { return $this->id; }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
index 473a8679f..a3734b75a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
@@ -34,10 +34,10 @@ class DDC949Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => true));
         $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => false));
 
-        $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true);
+        $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true, "True model not found");
         $this->assertTrue($true->booleanField, "True Boolean Model should be true.");
 
-        $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $false);
+        $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $false, "False model not found");
         $this->assertFalse($false->booleanField, "False Boolean Model should be false.");
     }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index 6589890fc..499fb8c4c 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -17,11 +17,11 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * Assert a valid SQL generation.
-     * 
+     *
      * @param string $dqlToBeTested
      * @param string $sqlToBeConfirmed
      * @param array $queryHints
-     * @param array $queryParams 
+     * @param array $queryParams
      */
     public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = array(), array $queryParams = array())
     {
@@ -34,11 +34,11 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 
             $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true)
                   ->useQueryCache(false);
-            
+
             foreach ($queryHints AS $name => $value) {
                 $query->setHint($name, $value);
             }
-            
+
             parent::assertEquals($sqlToBeConfirmed, $query->getSQL());
             $query->free();
         } catch (\Exception $e) {
@@ -383,7 +383,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')"
         );
     }
-    
+
     public function testSupportsInstanceOfExpressionInWherePartWithMultipleValues()
     {
         $this->assertSqlGeneration(
@@ -391,7 +391,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee', 'manager')"
         );
     }
-    
+
     /**
      * @group DDC-1194
      */
@@ -402,7 +402,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')"
         );
     }
-    
+
     /**
      * @group DDC-1194
      */
@@ -606,7 +606,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
                     . ')'
         );
     }
-    
+
     public function testExistsExpressionWithSimpleSelectReturningScalar()
     {
         $this->assertSqlGeneration(
@@ -703,7 +703,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, (SELECT COUNT(*) FROM cms_articles c1_ WHERE c1_.user_id = c0_.id) AS sclr4 FROM cms_users c0_ ORDER BY sclr4 ASC"
         );
     }
-    
+
     public function testOrderBySupportsSingleValuedPathExpressionOwningSide()
     {
         $this->assertSqlGeneration(
@@ -711,7 +711,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT c0_.id AS id0, c0_.topic AS topic1, c0_.text AS text2, c0_.version AS version3 FROM cms_articles c0_ ORDER BY c0_.user_id ASC"
         );
     }
-    
+
     /**
      * @expectedException Doctrine\ORM\Query\QueryException
      */
@@ -746,12 +746,12 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertSqlGeneration(
             "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = true",
-            "SELECT b0_.id AS id0, b0_.booleanField AS booleanField1 FROM boolean_model b0_ WHERE b0_.booleanField = true"
+            "SELECT b0_.id AS id0, b0_.booleanField AS booleanfield1 FROM boolean_model b0_ WHERE b0_.booleanField = true"
         );
 
         $this->assertSqlGeneration(
             "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = false",
-            "SELECT b0_.id AS id0, b0_.booleanField AS booleanField1 FROM boolean_model b0_ WHERE b0_.booleanField = false"
+            "SELECT b0_.id AS id0, b0_.booleanField AS booleanfield1 FROM boolean_model b0_ WHERE b0_.booleanField = false"
         );
 
         $this->_em->getConnection()->setDatabasePlatform($oldPlat);
@@ -894,7 +894,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertSqlGeneration(
             "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
-            "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 ".
+            "SELECT c0_.id AS ID0, c0_.status AS STATUS1, c0_.username AS USERNAME2, c0_.name AS NAME3 ".
             "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR UPDATE",
             array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::PESSIMISTIC_READ)
         );
@@ -948,7 +948,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             'SELECT c0_.id AS id0, c0_.name AS name1, count(c1_.id) AS sclr2 FROM cms_groups c0_ INNER JOIN cms_users_groups c2_ ON c0_.id = c2_.group_id INNER JOIN cms_users c1_ ON c1_.id = c2_.user_id GROUP BY c0_.id'
         );
     }
-    
+
     public function testCaseContainingNullIf()
     {
         $this->assertSqlGeneration(
@@ -956,7 +956,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             'SELECT NULLIF(c0_.id, c0_.name) AS sclr0 FROM cms_groups c0_'
         );
     }
-    
+
     public function testCaseContainingCoalesce()
     {
         $this->assertSqlGeneration(
@@ -1026,249 +1026,271 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             "SELECT d0_.article_id AS article_id0, d0_.title AS title1, d1_.article_id AS article_id2, d1_.title AS title3 FROM DDC117Link d2_ INNER JOIN DDC117Article d0_ ON d2_.target_id = d0_.article_id INNER JOIN DDC117Article d1_ ON d2_.source_id = d1_.article_id"
         );
     }
-    
+
     public function testGeneralCaseWithSingleWhenClause()
     {
         $this->assertSqlGeneration(
-            "SELECT g.id, CASE WHEN ((g.id / 2) > 18) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g", 
+            "SELECT g.id, CASE WHEN ((g.id / 2) > 18) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g",
             "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 > 18) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
         );
     }
-    
+
     public function testGeneralCaseWithMultipleWhenClause()
     {
         $this->assertSqlGeneration(
-            "SELECT g.id, CASE WHEN (g.id / 2 < 10) THEN 2 WHEN ((g.id / 2) > 20) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g", 
+            "SELECT g.id, CASE WHEN (g.id / 2 < 10) THEN 2 WHEN ((g.id / 2) > 20) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g",
             "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 < 10) THEN 2 WHEN (c0_.id / 2 > 20) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
         );
     }
-    
+
     public function testSimpleCaseWithSingleWhenClause()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id = CASE g.name WHEN 'admin' THEN 1 ELSE 2 END", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id = CASE g.name WHEN 'admin' THEN 1 ELSE 2 END",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id = CASE c0_.name WHEN admin THEN 1 ELSE 2 END"
         );
     }
-    
+
     public function testSimpleCaseWithMultipleWhenClause()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id = (CASE g.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END)", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id = (CASE g.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END)",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id = CASE c0_.name WHEN admin THEN 1 WHEN moderator THEN 2 ELSE 3 END"
         );
     }
-    
+
     public function testGeneralCaseWithSingleWhenClauseInSubselect()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN ((g2.id / 2) > 18) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN ((g2.id / 2) > 18) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN (c1_.id / 2 > 18) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
         );
     }
-    
+
     public function testGeneralCaseWithMultipleWhenClauseInSubselect()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN (g.id / 2 < 10) THEN 3 WHEN ((g.id / 2) > 20) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN (g.id / 2 < 10) THEN 3 WHEN ((g.id / 2) > 20) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN (c0_.id / 2 < 10) THEN 3 WHEN (c0_.id / 2 > 20) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
         );
     }
-    
+
     public function testSimpleCaseWithSingleWhenClauseInSubselect()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE g2.name WHEN 'admin' THEN 1 ELSE 2 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE g2.name WHEN 'admin' THEN 1 ELSE 2 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE c1_.name WHEN admin THEN 1 ELSE 2 END AS sclr2 FROM cms_groups c1_)"
         );
     }
-    
+
     public function testSimpleCaseWithMultipleWhenClauseInSubselect()
     {
         $this->assertSqlGeneration(
-            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE g2.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)", 
+            "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE g2.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
             "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE c1_.name WHEN admin THEN 1 WHEN moderator THEN 2 ELSE 3 END AS sclr2 FROM cms_groups c1_)"
         );
     }
-    
+
     /**
      * @group DDC-1339
      */
     public function testIdentityFunctionInSelectClause()
     {
         $this->assertSqlGeneration(
-            "SELECT IDENTITY(u.email) as email_id FROM Doctrine\Tests\Models\CMS\CmsUser u", 
+            "SELECT IDENTITY(u.email) as email_id FROM Doctrine\Tests\Models\CMS\CmsUser u",
             "SELECT c0_.email_id AS sclr0 FROM cms_users c0_"
         );
     }
-    
+
     /**
      * @group DDC-1339
      */
     public function testIdentityFunctionDoesNotAcceptStateField()
     {
         $this->assertInvalidSqlGeneration(
-            "SELECT IDENTITY(u.name) as name FROM Doctrine\Tests\Models\CMS\CmsUser u", 
+            "SELECT IDENTITY(u.name) as name FROM Doctrine\Tests\Models\CMS\CmsUser u",
             "Doctrine\ORM\Query\QueryException"
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInRootClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p', 
+            'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p',
             'SELECT c0_.id AS id0, c0_.name AS name1, c1_.title AS title2, c1_.car_id AS car_id3, c2_.salary AS salary4, c2_.department AS department5, c2_.startDate AS startDate6, c0_.discr AS discr7, c0_.spouse_id AS spouse_id8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id',
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInRootClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p', 
+            'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p',
             'SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_',
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInChildClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e', 
+            'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
             'SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c1_.startDate AS startDate4, c2_.title AS title5, c2_.car_id AS car_id6, c0_.discr AS discr7, c0_.spouse_id AS spouse_id8 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id',
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInChildClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e', 
+            'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
             'SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c1_.startDate AS startDate4, c0_.discr AS discr5 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id',
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInLeafClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m', 
+            'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m',
             'SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c1_.startDate AS startDate4, c2_.title AS title5, c0_.discr AS discr6, c0_.spouse_id AS spouse_id7, c2_.car_id AS car_id8 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id',
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeJoinInLeafClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m', 
+            'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m',
             'SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c1_.startDate AS startDate4, c2_.title AS title5, c0_.discr AS discr6 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id',
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInRootClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c', 
+            'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.fixPrice AS fixPrice2, c0_.hoursWorked AS hoursWorked3, c0_.pricePerHour AS pricePerHour4, c0_.maxPrice AS maxPrice5, c0_.discr AS discr6, c0_.salesPerson_id AS salesPerson_id7 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInRootClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c', 
+            'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.fixPrice AS fixPrice2, c0_.hoursWorked AS hoursWorked3, c0_.pricePerHour AS pricePerHour4, c0_.maxPrice AS maxPrice5, c0_.discr AS discr6 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInChildClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc', 
+            'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.hoursWorked AS hoursWorked2, c0_.pricePerHour AS pricePerHour3, c0_.maxPrice AS maxPrice4, c0_.discr AS discr5, c0_.salesPerson_id AS salesPerson_id6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInChildClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc', 
+            'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.hoursWorked AS hoursWorked2, c0_.pricePerHour AS pricePerHour3, c0_.maxPrice AS maxPrice4, c0_.discr AS discr5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInLeafClassWithDisabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc', 
+            'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.hoursWorked AS hoursWorked2, c0_.pricePerHour AS pricePerHour3, c0_.maxPrice AS maxPrice4, c0_.discr AS discr5, c0_.salesPerson_id AS salesPerson_id6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
     /**
      * @group DDC-1389
      */
     public function testInheritanceTypeSingleTableInLeafClassWithEnabledForcePartialLoad()
     {
         $this->assertSqlGeneration(
-            'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc', 
+            'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc',
             "SELECT c0_.id AS id0, c0_.completed AS completed1, c0_.hoursWorked AS hoursWorked2, c0_.pricePerHour AS pricePerHour3, c0_.maxPrice AS maxPrice4, c0_.discr AS discr5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')",
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
-    
+
     /**
      * @group DDC-1161
      */
     public function testSelfReferenceWithOneToOneDoesNotDuplicateAlias()
     {
         $this->assertSqlGeneration(
-            'SELECT p, pp FROM Doctrine\Tests\Models\Company\CompanyPerson p JOIN p.spouse pp', 
+            'SELECT p, pp FROM Doctrine\Tests\Models\Company\CompanyPerson p JOIN p.spouse pp',
             "SELECT c0_.id AS id0, c0_.name AS name1, c1_.title AS title2, c1_.car_id AS car_id3, c2_.salary AS salary4, c2_.department AS department5, c2_.startDate AS startDate6, c3_.id AS id7, c3_.name AS name8, c4_.title AS title9, c4_.car_id AS car_id10, c5_.salary AS salary11, c5_.department AS department12, c5_.startDate AS startDate13, c0_.discr AS discr14, c0_.spouse_id AS spouse_id15, c3_.discr AS discr16, c3_.spouse_id AS spouse_id17 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ ON c0_.spouse_id = c3_.id LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id",
             array(Query::HINT_FORCE_PARTIAL_LOAD => false)
         );
     }
-    
+
+    /**
+     * @group DDC-1384
+     */
+    public function testAliasDoesNotExceedPlatformDefinedLength()
+    {
+        $this->assertSqlGeneration(
+            'SELECT m FROM ' . __NAMESPACE__ .  '\\DDC1384Model m',
+            "SELECT d0_.aVeryLongIdentifierThatShouldBeShortenedByTheSQLWalker_fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo AS fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo0 FROM DDC1384Model d0_"
+        );
+    }
+
+    /**
+     * @group DDC-331
+     * @group DDC-1384
+     */
+    public function testIssue331()
+    {
+        $this->assertSqlGeneration(
+            'SELECT e.name FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
+            'SELECT c0_.name AS name0 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id'
+        );
+    }
     /**
      * @group DDC-1435
      */
@@ -1305,7 +1327,19 @@ class MyAbsFunction extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
         $parser->match(\Doctrine\ORM\Query\Lexer::T_OPEN_PARENTHESIS);
 
         $this->simpleArithmeticExpression = $parser->SimpleArithmeticExpression();
-        
+
         $parser->match(\Doctrine\ORM\Query\Lexer::T_CLOSE_PARENTHESIS);
     }
 }
+/**
+ * @Entity
+ */
+class DDC1384Model
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue
+     */
+    protected $aVeryLongIdentifierThatShouldBeShortenedByTheSQLWalker_fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo;
+}