Release 2.3.5

"Basic Mapping" documentation says:
"decimal: Type that maps a SQL DECIMAL to a PHP string."

UPGRADE.md

@@ -1,5 +1,11 @@
 # Upgrade to 2.3
 
+## Auto Discriminator Map breaks userland implementations with Listener
+
+The new feature to detect discriminator maps automatically when none
+are provided breaks userland implementations doing this with a
+listener in ``loadClassMetadata`` event.
+
 ## EntityManager#find() not calls EntityRepository#find() anymore
 
 Previous to 2.3, calling ``EntityManager#find()`` would be delegated to

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doctrine/orm",
-    "type": "library","version":"2.3.2",
+    "type": "library","version":"2.3.5",
     "description": "Object-Relational-Mapper for PHP",
     "keywords": ["orm", "database"],
     "homepage": "http://www.doctrine-project.org",

doctrine-mapping.xsd

@@ -329,6 +329,7 @@
     <xs:attribute name="name" type="xs:NMTOKEN" use="required" />
     <xs:attribute name="type" type="xs:NMTOKEN" />
     <xs:attribute name="column" type="xs:NMTOKEN" />
+    <xs:attribute name="length" type="xs:NMTOKEN" />
     <xs:attribute name="association-key" type="xs:boolean" default="false" />
     <xs:attribute name="column-definition" type="xs:string" />
     <xs:anyAttribute namespace="##other"/>

lib/Doctrine/ORM/AbstractQuery.php

@@ -26,6 +26,7 @@ use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 
 use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Mapping;
 
 /**
  * Base contract for ORM queries. Base class for Query and NativeQuery.
@@ -259,6 +260,9 @@ abstract class AbstractQuery
             case is_object($value) && $this->_em->getMetadataFactory()->hasMetadataFor(ClassUtils::getClass($value)):
                 return $this->convertObjectParameterToScalarValue($value);
 
+            case ($value instanceof Mapping\ClassMetadata):
+                return $value->name;
+
             default:
                 return $value;
         }
@@ -658,6 +662,18 @@ abstract class AbstractQuery
         return isset($this->_hints[$name]) ? $this->_hints[$name] : false;
     }
 
+    /**
+     * Check if the query has a hint
+     *
+     * @param  string $name The name of the hint
+     *
+     * @return bool False if the query does not have any hint
+     */
+    public function hasHint($name)
+    {
+        return isset($this->_hints[$name]);
+    }
+
     /**
      * Return the key value map of query hints that are currently set.
      *

lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php

@@ -0,0 +1,66 @@
+<?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 MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Id;
+
+use Doctrine\ORM\EntityManager;
+
+/**
+ * Id generator that obtains IDs from special "identity" columns. These are columns
+ * that automatically get a database-generated, auto-incremented identifier on INSERT.
+ * This generator obtains the last insert id after such an insert.
+ */
+class BigIntegerIdentityGenerator extends AbstractIdGenerator
+{
+    /**
+     * The name of the sequence to pass to lastInsertId(), if any.
+     *
+     * @var string
+     */
+    private $sequenceName;
+
+    /**
+     * Constructor.
+     *
+     * @param string|null $seqName The name of the sequence to pass to lastInsertId()
+     *                             to obtain the last generated identifier within the current
+     *                             database session/connection, if any.
+     */
+    public function __construct($sequenceName = null)
+    {
+        $this->sequenceName = $sequenceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate(EntityManager $em, $entity)
+    {
+        return (string)$em->getConnection()->lastInsertId($this->sequenceName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isPostInsertGenerator()
+    {
+        return true;
+    }
+}
+

lib/Doctrine/ORM/Id/IdentityGenerator.php

@@ -28,17 +28,21 @@ use Doctrine\ORM\EntityManager;
  */
 class IdentityGenerator extends AbstractIdGenerator
 {
-    /** @var string The name of the sequence to pass to lastInsertId(), if any. */
-    private $_seqName;
+    /**
+     * The name of the sequence to pass to lastInsertId(), if any.
+     *
+     * @var string
+     */
+    private $sequenceName;
 
     /**
      * @param string $seqName The name of the sequence to pass to lastInsertId()
      *                        to obtain the last generated identifier within the current
      *                        database session/connection, if any.
      */
-    public function __construct($seqName = null)
+    public function __construct($sequenceName = null)
     {
-        $this->_seqName = $seqName;
+        $this->sequenceName = $sequenceName;
     }
 
     /**
@@ -46,7 +50,7 @@ class IdentityGenerator extends AbstractIdGenerator
      */
     public function generate(EntityManager $em, $entity)
     {
-        return (int)$em->getConnection()->lastInsertId($this->_seqName);
+        return (int)$em->getConnection()->lastInsertId($this->sequenceName);
     }
 
     /**

lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php

@@ -118,6 +118,7 @@ class ArrayHydrator extends AbstractHydrator
                     $baseElement =& $this->_resultPointers[$parent];
                 } else {
                     unset($this->_resultPointers[$dqlAlias]); // Ticket #1228
+
                     continue;
                 }
 
@@ -139,6 +140,7 @@ class ArrayHydrator extends AbstractHydrator
 
                         if ( ! $indexExists || ! $indexIsValid) {
                             $element = $data;
+
                             if (isset($this->_rsm->indexByMap[$dqlAlias])) {
                                 $baseElement[$relationAlias][$row[$this->_rsm->indexByMap[$dqlAlias]]] = $element;
                             } else {
@@ -155,7 +157,10 @@ class ArrayHydrator extends AbstractHydrator
                 } else {
                     $oneToOne = true;
 
-                    if ( ! isset($nonemptyComponents[$dqlAlias]) && ! isset($baseElement[$relationAlias])) {
+                    if (
+                        ( ! isset($nonemptyComponents[$dqlAlias])) &&
+                        ( ! isset($baseElement[$relationAlias]))
+                    ) {
                         $baseElement[$relationAlias] = null;
                     } else if ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = $data;
@@ -164,10 +169,9 @@ class ArrayHydrator extends AbstractHydrator
 
                 $coll =& $baseElement[$relationAlias];
 
-                if ($coll !== null) {
+                if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
                 }
-
             } else {
                 // It's a root result element
 
@@ -176,22 +180,21 @@ class ArrayHydrator extends AbstractHydrator
 
                 // if this row has a NULL value for the root result id then make it a null result.
                 if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
-                    if ($this->_rsm->isMixed) {
-                        $result[] = array($entityKey => null);
-                    } else {
-                        $result[] = null;
-                    }
+                    $result[] = $this->_rsm->isMixed
+                        ? array($entityKey => null)
+                        : null;
+
                     $resultKey = $this->_resultCounter;
                     ++$this->_resultCounter;
+
                     continue;
                 }
 
                 // Check for an existing element
                 if ($this->_isSimpleQuery || ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) {
-                    $element = $rowData[$dqlAlias];
-                    if ($this->_rsm->isMixed) {
-                        $element = array($entityKey => $element);
-                    }
+                    $element = $this->_rsm->isMixed
+                        ? array($entityKey => $rowData[$dqlAlias])
+                        : $rowData[$dqlAlias];
 
                     if (isset($this->_rsm->indexByMap[$dqlAlias])) {
                         $resultKey = $row[$this->_rsm->indexByMap[$dqlAlias]];
@@ -199,6 +202,7 @@ class ArrayHydrator extends AbstractHydrator
                     } else {
                         $resultKey = $this->_resultCounter;
                         $result[] = $element;
+
                         ++$this->_resultCounter;
                     }
 
@@ -206,11 +210,13 @@ class ArrayHydrator extends AbstractHydrator
                 } else {
                     $index = $this->_identifierMap[$dqlAlias][$id[$dqlAlias]];
                     $resultKey = $index;
+
                     /*if ($this->_rsm->isMixed) {
                         $result[] =& $result[$index];
                         ++$this->_resultCounter;
                     }*/
                 }
+
                 $this->updateResultPointer($result, $index, $dqlAlias, false);
             }
         }
@@ -219,11 +225,9 @@ class ArrayHydrator extends AbstractHydrator
         if (isset($scalars)) {
             if ( ! isset($resultKey) ) {
                 // this only ever happens when no object is fetched (scalar result only)
-                if (isset($this->_rsm->indexByMap['scalars'])) {
-                    $resultKey = $row[$this->_rsm->indexByMap['scalars']];
-                } else {
-                    $resultKey = $this->_resultCounter - 1;
-                }
+                $resultKey = isset($this->_rsm->indexByMap['scalars'])
+                    ? $row[$this->_rsm->indexByMap['scalars']]
+                    : $this->_resultCounter - 1;
             }
 
             foreach ($scalars as $name => $value) {
@@ -249,6 +253,12 @@ class ArrayHydrator extends AbstractHydrator
             return;
         }
 
+        if ($oneToOne) {
+            $this->_resultPointers[$dqlAlias] =& $coll;
+
+            return;
+        }
+
         if ($index !== false) {
             $this->_resultPointers[$dqlAlias] =& $coll[$index];
 
@@ -259,12 +269,6 @@ class ArrayHydrator extends AbstractHydrator
             return;
         }
 
-        if ($oneToOne) {
-            $this->_resultPointers[$dqlAlias] =& $coll;
-
-            return;
-        }
-
         end($coll);
         $this->_resultPointers[$dqlAlias] =& $coll[key($coll)];
 

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

@@ -27,6 +27,7 @@ use PDO,
     Doctrine\ORM\Events,
     Doctrine\Common\Collections\ArrayCollection,
     Doctrine\Common\Collections\Collection,
+    Doctrine\ORM\UnitOfWork,
     Doctrine\ORM\Proxy\Proxy;
 
 /**
@@ -65,8 +66,8 @@ class ObjectHydrator extends AbstractHydrator
 
         $this->_resultCounter = 0;
 
-        if ( ! isset($this->_hints['deferEagerLoad'])) {
-            $this->_hints['deferEagerLoad'] = true;
+        if ( ! isset($this->_hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
+            $this->_hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
         }
 
         foreach ($this->_rsm->aliasMap as $dqlAlias => $className) {
@@ -123,7 +124,7 @@ class ObjectHydrator extends AbstractHydrator
      */
     protected function cleanup()
     {
-        $eagerLoad = (isset($this->_hints['deferEagerLoad'])) && $this->_hints['deferEagerLoad'] == true;
+        $eagerLoad = (isset($this->_hints[UnitOfWork::HINT_DEFEREAGERLOAD])) && $this->_hints[UnitOfWork::HINT_DEFEREAGERLOAD] == true;
 
         parent::cleanup();
 

lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php

@@ -178,10 +178,13 @@ class SimpleObjectHydrator extends AbstractHydrator
                 // One solution is to load the association, but it might require extra efforts.
                 return array('name' => $column);
 
-            default:
+            case (isset($this->_rsm->metaMappings[$column])):
                 return array(
                     'name' => $this->_rsm->metaMappings[$column]
                 );
+
+            default:
+                return null;
         }
     }
 }

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -19,16 +19,17 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use ReflectionException,
-    Doctrine\ORM\ORMException,
-    Doctrine\ORM\EntityManager,
-    Doctrine\DBAL\Platforms,
-    Doctrine\ORM\Events,
-    Doctrine\Common\Persistence\Mapping\ReflectionService,
-    Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface,
-    Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory,
-    Doctrine\ORM\Id\IdentityGenerator,
-    Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use ReflectionException;
+use Doctrine\ORM\ORMException;
+use Doctrine\ORM\EntityManager;
+use Doctrine\DBAL\Platforms;
+use Doctrine\ORM\Events;
+use Doctrine\Common\Persistence\Mapping\ReflectionService;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface;
+use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
+use Doctrine\ORM\Id\IdentityGenerator;
+use Doctrine\ORM\Id\BigIntegerIdentityGenerator;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 
 /**
  * The ClassMetadataFactory is used to create ClassMetadata objects that contain all the
@@ -418,9 +419,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
                 // <table>_<column>_seq in PostgreSQL for SERIAL columns.
                 // Not pretty but necessary and the simplest solution that currently works.
                 $sequenceName = null;
+                $fieldName    = $class->identifier ? $class->getSingleIdentifierFieldName() : null;
 
                 if ($this->targetPlatform instanceof Platforms\PostgreSQLPlatform) {
-                    $fieldName      = $class->getSingleIdentifierFieldName();
                     $columnName     = $class->getSingleIdentifierColumnName();
                     $quoted         = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']);
                     $sequenceName   = $class->getTableName() . '_' . $columnName . '_seq';
@@ -435,7 +436,12 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
                     $sequenceName = $this->em->getConfiguration()->getQuoteStrategy()->getSequenceName($definition, $class, $this->targetPlatform);
                 }
 
-                $class->setIdGenerator(new \Doctrine\ORM\Id\IdentityGenerator($sequenceName));
+                $generator = ($fieldName && $class->fieldMappings[$fieldName]['type'] === "bigint")
+                    ? new BigIntegerIdentityGenerator($sequenceName)
+                    : new IdentityGenerator($sequenceName);
+
+                $class->setIdGenerator($generator);
+
                 break;
 
             case ClassMetadata::GENERATOR_TYPE_SEQUENCE:

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -1421,6 +1421,10 @@ class ClassMetadataInfo implements ClassMetadata
         $mapping['orphanRemoval']   = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false;
         $mapping['isCascadeRemove'] = $mapping['orphanRemoval'] ? true : $mapping['isCascadeRemove'];
 
+        if ($mapping['orphanRemoval']) {
+            unset($mapping['unique']);
+        }
+
         if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
             throw MappingException::illegalInverseIdentifierAssocation($this->name, $mapping['fieldName']);
         }
@@ -2602,8 +2606,12 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public function setSequenceGeneratorDefinition(array $definition)
     {
-        if (isset($definition['name']) && $definition['name'] == '`') {
-            $definition['name']   = trim($definition['name'], '`');
+        if ( ! isset($definition['sequenceName'])) {
+            throw MappingException::missingSequenceName($this->name);
+        }
+
+        if ($definition['sequenceName'][0] == '`') {
+            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 

lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php

@@ -217,7 +217,8 @@ class DatabaseDriver implements MappingDriver
         }
 
         if ($ids) {
-            if (count($ids) == 1) {
+            // We need to check for the columns here, because we might have associations as id as well.
+            if (count($primaryKeyColumns) == 1) {
                 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
             }
 

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

@@ -233,6 +233,7 @@ class XmlDriver extends FileDriver
 
                 if (isset($mapping['version'])) {
                     $metadata->setVersionMapping($mapping);
+                    unset($mapping['version']);
                 }
 
                 $metadata->mapField($mapping);
@@ -662,7 +663,7 @@ class XmlDriver extends FileDriver
         }
 
         if (isset($fieldMapping['version']) && $fieldMapping['version']) {
-            $mapping['version'] = $fieldMapping['version'];
+            $mapping['version'] = $this->evaluateBoolean($fieldMapping['version']);
         }
 
         if (isset($fieldMapping['column-definition'])) {

lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php

@@ -299,6 +299,7 @@ class YamlDriver extends FileDriver
 
                 if (isset($mapping['version'])) {
                     $metadata->setVersionMapping($mapping);
+                    unset($mapping['version']);
                 }
 
                 $metadata->mapField($mapping);

lib/Doctrine/ORM/Mapping/MappingException.php

@@ -438,4 +438,16 @@ class MappingException extends \Doctrine\ORM\ORMException
             $cascades
         ));
     }
+
+    /**
+     * @param string $className
+     *
+     * @return MappingException
+     */
+    public static function missingSequenceName($className)
+    {
+        return new self(
+            sprintf('Missing "sequenceName" attribute for sequence id generator definition on class "%s".', $className)
+        );
+    }
 }

lib/Doctrine/ORM/OptimisticLockException.php

@@ -54,6 +54,8 @@ class OptimisticLockException extends ORMException
 
     public static function lockFailedVersionMissmatch($entity, $expectedLockVersion, $actualLockVersion)
     {
+        $expectedLockVersion = ($expectedLockVersion instanceof \DateTime) ? $expectedLockVersion->getTimestamp() : $expectedLockVersion;
+        $actualLockVersion = ($actualLockVersion instanceof \DateTime) ? $actualLockVersion->getTimestamp() : $actualLockVersion;
         return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion, $entity);
     }
 

lib/Doctrine/ORM/PersistentCollection.php

@@ -717,6 +717,8 @@ final class PersistentCollection implements Collection, Selectable
 
     public function key()
     {
+        $this->initialize();
+
         return $this->coll->key();
     }
 
@@ -725,6 +727,8 @@ final class PersistentCollection implements Collection, Selectable
      */
     public function current()
     {
+        $this->initialize();
+
         return $this->coll->current();
     }
 
@@ -733,6 +737,8 @@ final class PersistentCollection implements Collection, Selectable
      */
     public function next()
     {
+        $this->initialize();
+        
         return $this->coll->next();
     }
 
@@ -805,6 +811,10 @@ final class PersistentCollection implements Collection, Selectable
      */
     public function matching(Criteria $criteria)
     {
+        if ($this->isDirty) {
+            $this->initialize();
+        }
+
         if ($this->initialized) {
             return $this->coll->matching($criteria);
         }
@@ -813,16 +823,10 @@ final class PersistentCollection implements Collection, Selectable
             throw new \RuntimeException("Matching Criteria on PersistentCollection only works on OneToMany assocations at the moment.");
         }
 
-        // If there are NEW objects we have to check if any of them matches the criteria
-        $newObjects = array();
-
-        if ($this->isDirty) {
-            $newObjects = $this->coll->matching($criteria)->toArray();
-        }
-
-        $targetClass = $this->em->getClassMetadata(get_class($this->owner));
-
-        $id              = $targetClass->getSingleIdReflectionProperty()->getValue($this->owner);
+        $id              = $this->em
+            ->getClassMetadata(get_class($this->owner))
+            ->getSingleIdReflectionProperty()
+            ->getValue($this->owner);
         $builder         = Criteria::expr();
         $ownerExpression = $builder->eq($this->backRefFieldName, $id);
         $expression      = $criteria->getWhereExpression();
@@ -832,7 +836,7 @@ final class PersistentCollection implements Collection, Selectable
 
         $persister = $this->em->getUnitOfWork()->getEntityPersister($this->association['targetEntity']);
 
-        return new ArrayCollection(array_merge($persister->loadCriteria($criteria), $newObjects));
+        return new ArrayCollection($persister->loadCriteria($criteria));
     }
 }
 

lib/Doctrine/ORM/Persisters/BasicEntityPersister.php

@@ -88,7 +88,7 @@ class BasicEntityPersister
      */
     static private $comparisonMap = array(
         Comparison::EQ  => '= %s',
-        Comparison::IS  => 'IS %s',
+        Comparison::IS  => '= %s',
         Comparison::NEQ => '!= %s',
         Comparison::GT  => '> %s',
         Comparison::GTE => '>= %s',
@@ -518,13 +518,34 @@ class BasicEntityPersister
      */
     public function delete($entity)
     {
+        $class      = $this->_class;
+        $em         = $this->_em;
+
         $identifier = $this->_em->getUnitOfWork()->getEntityIdentifier($entity);
+        $tableName  = $this->quoteStrategy->getTableName($class, $this->_platform);
+        $idColumns  = $this->quoteStrategy->getIdentifierColumnNames($class, $this->_platform);
+        $id         = array_combine($idColumns, $identifier);
+        $types      = array_map(function ($identifier) use ($class, $em) {
+
+            if (isset($class->fieldMappings[$identifier])) {
+                return $class->fieldMappings[$identifier]['type'];
+            }
+
+            $targetMapping = $em->getClassMetadata($class->associationMappings[$identifier]['targetEntity']);
+
+            if (isset($targetMapping->fieldMappings[$targetMapping->identifier[0]])) {
+                return $targetMapping->fieldMappings[$targetMapping->identifier[0]]['type'];
+            }
+
+            if (isset($targetMapping->associationMappings[$targetMapping->identifier[0]])) {
+                return $targetMapping->associationMappings[$targetMapping->identifier[0]]['type'];
+            }
+
+            throw ORMException::unrecognizedField($targetMapping->identifier[0]);
+        }, $class->identifier);
 
         $this->deleteJoinTableRecords($identifier);
-
-        $id = array_combine($this->quoteStrategy->getIdentifierColumnNames($this->_class, $this->_platform), $identifier);
-
-        $this->_conn->delete($this->quoteStrategy->getTableName($this->_class, $this->_platform), $id);
+        $this->_conn->delete($tableName, $id, $types);
     }
 
     /**
@@ -790,7 +811,7 @@ class BasicEntityPersister
 
         $hydrator = $this->_em->newHydrator(($this->_selectJoinSql) ? Query::HYDRATE_OBJECT : Query::HYDRATE_SIMPLEOBJECT);
 
-        return $hydrator->hydrateAll($stmt, $this->_rsm, array('deferEagerLoads' => true));
+        return $hydrator->hydrateAll($stmt, $this->_rsm, array(UnitOfWork::HINT_DEFEREAGERLOAD => true));
     }
 
     /**
@@ -845,7 +866,7 @@ class BasicEntityPersister
 
         $hydrator = $this->_em->newHydrator(($this->_selectJoinSql) ? Query::HYDRATE_OBJECT : Query::HYDRATE_SIMPLEOBJECT);
 
-        return $hydrator->hydrateAll($stmt, $this->_rsm, array('deferEagerLoads' => true));
+        return $hydrator->hydrateAll($stmt, $this->_rsm, array(UnitOfWork::HINT_DEFEREAGERLOAD => true));
     }
 
     /**
@@ -874,7 +895,7 @@ class BasicEntityPersister
      */
     private function loadArrayFromStatement($assoc, $stmt)
     {
-        $hints = array('deferEagerLoads' => true);
+        $hints = array(UnitOfWork::HINT_DEFEREAGERLOAD => true);
 
         if (isset($assoc['indexBy'])) {
             $rsm = clone ($this->_rsm); // this is necessary because the "default rsm" should be changed.
@@ -899,7 +920,7 @@ class BasicEntityPersister
      */
     private function loadCollectionFromStatement($assoc, $stmt, $coll)
     {
-        $hints = array('deferEagerLoads' => true, 'collection' => $coll);
+        $hints = array(UnitOfWork::HINT_DEFEREAGERLOAD => true, 'collection' => $coll);
 
         if (isset($assoc['indexBy'])) {
             $rsm = clone ($this->_rsm); // this is necessary because the "default rsm" should be changed.
@@ -1457,6 +1478,18 @@ class BasicEntityPersister
             $placeholder = $type->convertToDatabaseValueSQL($placeholder, $this->_platform);
         }
 
+        if ($comparison !== null) {
+
+            // special case null value handling
+            if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && $value === null) {
+                return $conditionSql . ' IS NULL';
+            } else if ($comparison === Comparison::NEQ && $value === null) {
+                return $conditionSql . ' IS NOT NULL';
+            }
+
+            return $conditionSql . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
+        }
+
         $conditionSql .= ($comparison === null)
             ? ((is_array($value)) ? ' IN (?)' : (($value === null) ? ' IS NULL' : ' = ' . $placeholder))
             : ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);

lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php

@@ -184,7 +184,9 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
                 }
 
                 foreach ($data as $columnName => $value) {
-                    $stmt->bindValue($paramIndex++, $value, $this->_columnTypes[$columnName]);
+                    if (!is_array($id) || !isset($id[$columnName])) {
+                        $stmt->bindValue($paramIndex++, $value, $this->_columnTypes[$columnName]);
+                    }
                 }
 
                 $stmt->execute();

lib/Doctrine/ORM/Persisters/ManyToManyPersister.php

@@ -186,22 +186,22 @@ class ManyToManyPersister extends AbstractCollectionPersister
      */
     protected function _getDeleteSQLParameters(PersistentCollection $coll)
     {
-        $identifier = $this->_uow->getEntityIdentifier($coll->getOwner());
         $mapping    = $coll->getMapping();
-        $params     = array();
+        $identifier = $this->_uow->getEntityIdentifier($coll->getOwner());
 
         // Optimization for single column identifier
         if (count($mapping['relationToSourceKeyColumns']) === 1) {
-            $params[] = array_pop($identifier);
-
-            return $params;
+            return array(reset($identifier));
         }
 
         // Composite identifier
         $sourceClass = $this->_em->getClassMetadata(get_class($coll->getOwner()));
+        $params      = array();
 
-        foreach ($mapping['relationToSourceKeyColumns'] as $srcColumn) {
-            $params[] = $identifier[$sourceClass->fieldNames[$srcColumn]];
+        foreach ($mapping['relationToSourceKeyColumns'] as $columnName => $refColumnName) {
+            $params[] = isset($sourceClass->fieldNames[$refColumnName])
+                ? $identifier[$sourceClass->fieldNames[$refColumnName]]
+                : $identifier[$sourceClass->getFieldForColumn($columnName)];
         }
 
         return $params;

lib/Doctrine/ORM/Persisters/SqlValueVisitor.php

@@ -57,7 +57,14 @@ class SqlValueVisitor extends ExpressionVisitor
     {
         $value          = $comparison->getValue()->getValue();
         $field          = $comparison->getField();
-        
+        $operator       = $comparison->getOperator();
+
+        if (($operator === Comparison::EQ || $operator === Comparison::IS) && $value === null) {
+            return;
+        } else if ($operator === Comparison::NEQ && $value === null) {
+            return;
+        }
+
         $this->values[] = $value;
         $this->types[]  = array($field, $value);
     }

lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php

@@ -104,19 +104,8 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
 
                     $updateSql .= $sqlWalker->walkUpdateItem($updateItem);
 
-                    //FIXME: parameters can be more deeply nested. traverse the tree.
-                    //FIXME (URGENT): With query cache the parameter is out of date. Move to execute() stage.
                     if ($newValue instanceof AST\InputParameter) {
-                        $parameterName = $newValue->name;
-                        $parameter     = $sqlWalker->getQuery()->getParameter($parameterName);
-
-                        $value = $sqlWalker->getQuery()->processParameterValue($parameter->getValue());
-                        $type  = ($parameter->getValue() === $value)
-                            ? $parameter->getType()
-                            : ParameterTypeInferer::inferType($value);
-
-                        $this->_sqlParameters[$i]['parameters'][] = $value;
-                        $this->_sqlParameters[$i]['types'][] = $type;
+                        $this->_sqlParameters[$i][] = $newValue->name;
 
                         ++$this->_numParametersInUpdateClause;
                     }
@@ -168,16 +157,18 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
             );
 
             // Execute UPDATE statements
-            for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) {
-                $parameters = array();
-                $types      = array();
+            foreach ($this->_sqlStatements as $key => $statement) {
+                $paramValues = array();
+                $paramTypes  = array();
 
-                if (isset($this->_sqlParameters[$i])) {
-                    $parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array();
-                    $types = isset($this->_sqlParameters[$i]['types']) ? $this->_sqlParameters[$i]['types'] : array();
+                if (isset($this->_sqlParameters[$key])) {
+                    foreach ($this->_sqlParameters[$key] as $parameterKey => $parameterName) {
+                        $paramValues[] = $params[$parameterKey];
+                        $paramTypes[]  = isset($types[$parameterKey]) ? $types[$parameterKey] : ParameterTypeInferer::inferType($params[$parameterKey]);
+                    }
                 }
 
-                $conn->executeUpdate($this->_sqlStatements[$i], $parameters, $types);
+                $conn->executeUpdate($statement, $paramValues, $paramTypes);
             }
         } catch (\Exception $exception) {
             // FAILURE! Drop temporary table to avoid possible collisions

lib/Doctrine/ORM/Query/Expr/Base.php

@@ -83,7 +83,7 @@ abstract class Base
      */
     public function add($arg)
     {
-        if ( $arg !== null || ($arg instanceof self && $arg->count() > 0) ) {
+        if ( $arg !== null && (!$arg instanceof self || $arg->count() > 0) ) {
             // If we decide to keep Expr\Base instances, we can use this check
             if ( ! is_string($arg)) {
                 $class = get_class($arg);

lib/Doctrine/ORM/Query/Expr/Join.php

@@ -141,7 +141,7 @@ class Join
     {
         return strtoupper($this->joinType) . ' JOIN ' . $this->join
              . ($this->alias ? ' ' . $this->alias : '')
-             . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '')
-             . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '');
+             . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
+             . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
     }
 }

lib/Doctrine/ORM/Query/Filter/SQLFilter.php

@@ -19,9 +19,9 @@
 
 namespace Doctrine\ORM\Query\Filter;
 
-use Doctrine\ORM\EntityManager,
-    Doctrine\ORM\Mapping\ClassMetaData,
-    Doctrine\ORM\Query\ParameterTypeInferer;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Query\ParameterTypeInferer;
 
 /**
  * The base class that user defined filters should extend.

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

@@ -101,7 +101,13 @@ class ResultSetMappingBuilder extends ResultSetMapping
                     if (isset($this->metaMappings[$renamedColumnName])) {
                         throw new \InvalidArgumentException("The column '$renamedColumnName' conflicts with another column in the mapper.");
                     }
-                    $this->addMetaResult($alias, $renamedColumnName, $columnName);
+
+                    $this->addMetaResult(
+                        $alias,
+                        $renamedColumnName,
+                        $columnName,
+                        (isset($associationMapping['id']) && $associationMapping['id'] === true)
+                    );
                 }
             }
         }

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -750,7 +750,10 @@ class SqlWalker implements TreeWalker
         $sqlParts = array();
 
         foreach ($identificationVarDecls as $identificationVariableDecl) {
-            $sql = $this->walkRangeVariableDeclaration($identificationVariableDecl->rangeVariableDeclaration);
+            $sql = $this->platform->appendLockHint(
+                $this->walkRangeVariableDeclaration($identificationVariableDecl->rangeVariableDeclaration),
+                $this->query->getHint(Query::HINT_LOCK_MODE)
+            );
 
             foreach ($identificationVariableDecl->joins as $join) {
                 $sql .= $this->walkJoin($join);
@@ -770,7 +773,7 @@ class SqlWalker implements TreeWalker
                 }
             }
 
-            $sqlParts[] = $this->platform->appendLockHint($sql, $this->query->getHint(Query::HINT_LOCK_MODE));
+            $sqlParts[] = $sql;
         }
 
         return ' FROM ' . implode(', ', $sqlParts);
@@ -801,9 +804,13 @@ class SqlWalker implements TreeWalker
     /**
      * Walks down a JoinAssociationDeclaration AST node, thereby generating the appropriate SQL.
      *
+     * @param AST\JoinAssociationDeclaration $joinAssociationDeclaration
+     * @param int                            $joinType
+     * @param AST\ConditionalExpression      $condExpr
+     *
      * @return string
      */
-    public function walkJoinAssociationDeclaration($joinAssociationDeclaration, $joinType = AST\Join::JOIN_TYPE_INNER)
+    public function walkJoinAssociationDeclaration($joinAssociationDeclaration, $joinType = AST\Join::JOIN_TYPE_INNER, $condExpr = null)
     {
         $sql = '';
 
@@ -918,6 +925,13 @@ class SqlWalker implements TreeWalker
                 break;
         }
 
+        // Handle WITH clause
+        if ($condExpr !== null) {
+            // Phase 2 AST optimization: Skip processing of ConditionalExpression
+            // if only one ConditionalTerm is defined
+            $sql .= ' AND (' . $this->walkConditionalExpression($condExpr) . ')';
+        }
+
         // FIXME: these should either be nested or all forced to be left joins (DDC-XXX)
         if ($targetClass->isInheritanceTypeJoined()) {
             $sql .= $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
@@ -1017,14 +1031,7 @@ class SqlWalker implements TreeWalker
                 break;
 
             case ($joinDeclaration instanceof \Doctrine\ORM\Query\AST\JoinAssociationDeclaration):
-                $sql .= $this->walkJoinAssociationDeclaration($joinDeclaration, $joinType);
-
-                // Handle WITH clause
-                if (($condExpr = $join->conditionalExpression) !== null) {
-                    // Phase 2 AST optimization: Skip processment of ConditionalExpression
-                    // if only one ConditionalTerm is defined
-                    $sql .= ' AND (' . $this->walkConditionalExpression($condExpr) . ')';
-                }
+                $sql .= $this->walkJoinAssociationDeclaration($joinDeclaration, $joinType, $join->conditionalExpression);
                 break;
         }
 
@@ -1367,13 +1374,16 @@ class SqlWalker implements TreeWalker
         $sqlParts = array ();
 
         foreach ($identificationVarDecls as $subselectIdVarDecl) {
-            $sql = $this->walkRangeVariableDeclaration($subselectIdVarDecl->rangeVariableDeclaration);
+            $sql = $this->platform->appendLockHint(
+                $this->walkRangeVariableDeclaration($subselectIdVarDecl->rangeVariableDeclaration),
+                $this->query->getHint(Query::HINT_LOCK_MODE)
+            );
 
             foreach ($subselectIdVarDecl->joins as $join) {
                 $sql .= $this->walkJoin($join);
             }
 
-            $sqlParts[] = $this->platform->appendLockHint($sql, $this->query->getHint(Query::HINT_LOCK_MODE));
+            $sqlParts[] = $sql;
         }
 
         return ' FROM ' . implode(', ', $sqlParts);
@@ -1910,31 +1920,22 @@ class SqlWalker implements TreeWalker
 
         foreach ($instanceOfExpr->value as $parameter) {
             if ($parameter instanceof AST\InputParameter) {
-                // We need to modify the parameter value to be its correspondent mapped value
-                $dqlParamKey = $parameter->name;
-                $dqlParam    = $this->query->getParameter($dqlParamKey);
-                $paramValue  = $this->query->processParameterValue($dqlParam->getValue());
-
-                if ( ! ($paramValue instanceof \Doctrine\ORM\Mapping\ClassMetadata)) {
-                    throw QueryException::invalidParameterType('ClassMetadata', get_class($paramValue));
-                }
-
-                $entityClassName = $paramValue->name;
+                $sqlParameterList[] = $this->walkInputParameter($parameter);
             } else {
                 // Get name from ClassMetadata to resolve aliases.
                 $entityClassName = $this->em->getClassMetadata($parameter)->name;
-            }
 
-            if ($entityClassName == $class->name) {
-                $sqlParameterList[] = $this->conn->quote($class->discriminatorValue);
-            } else {
-                $discrMap = array_flip($class->discriminatorMap);
+                if ($entityClassName == $class->name) {
+                    $sqlParameterList[] = $this->conn->quote($class->discriminatorValue);
+                } else {
+                    $discrMap = array_flip($class->discriminatorMap);
 
-                if (!isset($discrMap[$entityClassName])) {
-                    throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName);
+                    if (!isset($discrMap[$entityClassName])) {
+                        throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName);
+                    }
+
+                    $sqlParameterList[] = $this->conn->quote($discrMap[$entityClassName]);
                 }
-
-                $sqlParameterList[] = $this->conn->quote($discrMap[$entityClassName]);
             }
         }
 

lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -152,7 +152,7 @@ class EntityGenerator
         Type::SMALLINT      => 'integer',
         Type::TEXT          => 'string',
         Type::BLOB          => 'string',
-        Type::DECIMAL       => 'float',
+        Type::DECIMAL       => 'string',
         Type::JSON_ARRAY    => 'array',
         Type::SIMPLE_ARRAY  => 'array',
     );
@@ -1089,6 +1089,15 @@ public function __construct()
                 $typeOptions[] = 'orphanRemoval=' . ($associationMapping['orphanRemoval'] ? 'true' : 'false');
             }
 
+            if (isset($associationMapping['fetch']) && $associationMapping['fetch'] !== ClassMetadataInfo::FETCH_LAZY) {
+                $fetchMap = array(
+                    ClassMetadataInfo::FETCH_EXTRA_LAZY => 'EXTRA_LAZY',
+                    ClassMetadataInfo::FETCH_EAGER      => 'EAGER',
+                );
+
+                $typeOptions[] = 'fetch="' . $fetchMap[$associationMapping['fetch']] . '"';
+            }
+
             $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
 
             if (isset($associationMapping['joinColumns']) && $associationMapping['joinColumns']) {

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

@@ -140,9 +140,15 @@ class XmlExporter extends AbstractExporter
                 if (isset($field['columnName'])) {
                     $idXml->addAttribute('column', $field['columnName']);
                 }
+
+                if (isset($field['length'])) {
+                    $idXml->addAttribute('length', $field['length']);
+                }
+
                 if (isset($field['associationKey']) && $field['associationKey']) {
                     $idXml->addAttribute('association-key', 'true');
                 }
+
                 if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
                     $generatorXml = $idXml->addChild('generator');
                     $generatorXml->addAttribute('strategy', $idGeneratorType);

lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php

@@ -74,6 +74,10 @@ class CountOutputWalker extends SqlWalker
      */
     public function walkSelectStatement(SelectStatement $AST)
     {
+        if ($this->platform->getName() === "mssql") {
+            $AST->orderByClause = null;
+        }
+
         $sql = parent::walkSelectStatement($AST);
 
         // Find out the SQL alias of the identifier column of the root entity

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

@@ -122,7 +122,7 @@ class Paginator implements \Countable, \IteratorAggregate
             /* @var $countQuery Query */
             $countQuery = $this->cloneQuery($this->query);
 
-            if ( ! $countQuery->getHint(CountWalker::HINT_DISTINCT)) {
+            if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
                 $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
             }
 

lib/Doctrine/ORM/Tools/SchemaTool.php

@@ -385,22 +385,14 @@ class SchemaTool
         }
 
         if (isset($mapping['options'])) {
-            if (isset($mapping['options']['comment'])) {
-                $options['comment'] = $mapping['options']['comment'];
+            $knownOptions = array('comment', 'unsigned', 'fixed', 'default');
 
-                unset($mapping['options']['comment']);
-            }
+            foreach ($knownOptions as $knownOption) {
+                if ( isset($mapping['options'][$knownOption])) {
+                    $options[$knownOption] = $mapping['options'][$knownOption];
 
-            if (isset($mapping['options']['unsigned'])) {
-                $options['unsigned'] = $mapping['options']['unsigned'];
-
-                unset($mapping['options']['unsigned']);
-            }
-
-            if (isset($mapping['options']['fixed'])) {
-                $options['fixed'] = $mapping['options']['fixed'];
-
-                unset($mapping['options']['fixed']);
+                    unset($mapping['options'][$knownOption]);
+                }
             }
 
             $options['customSchemaOptions'] = $mapping['options'];

lib/Doctrine/ORM/UnitOfWork.php

@@ -67,6 +67,13 @@ class UnitOfWork implements PropertyChangedListener
      */
     const STATE_REMOVED = 4;
 
+    /**
+     * Hint used to collect all primary keys of associated entities during hydration
+     * and execute it in a dedicated query afterwards
+     * @see https://doctrine-orm.readthedocs.org/en/latest/reference/dql-doctrine-query-language.html?highlight=eager#temporarily-change-fetch-mode-in-dql
+     */
+    const HINT_DEFEREAGERLOAD = 'deferEagerLoad';
+
     /**
      * The identity map that holds references to all managed entities that have
      * an identity. The entities are grouped by their class name.
@@ -400,13 +407,15 @@ class UnitOfWork implements PropertyChangedListener
      */
     private function computeSingleEntityChangeSet($entity)
     {
-        if ( $this->getEntityState($entity) !== self::STATE_MANAGED) {
-            throw new \InvalidArgumentException("Entity has to be managed for single computation " . self::objToStr($entity));
+        $state = $this->getEntityState($entity);
+
+        if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
         }
 
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if ($class->isChangeTrackingDeferredImplicit()) {
+        if ($state === self::STATE_MANAGED && $class->isChangeTrackingDeferredImplicit()) {
             $this->persist($entity);
         }
 
@@ -1376,6 +1385,10 @@ class UnitOfWork implements PropertyChangedListener
             return self::STATE_NEW;
         }
 
+        if ($class->containsForeignIdentifier) {
+            $id = $this->flattenIdentifier($class, $id);
+        }
+
         switch (true) {
             case ($class->isIdentifierNatural());
                 // Check for a version field, if available, to avoid a db lookup.
@@ -1688,6 +1701,29 @@ class UnitOfWork implements PropertyChangedListener
         return $this->doMerge($entity, $visited);
     }
 
+    /**
+     * convert foreign identifiers into scalar foreign key values to avoid object to string conversion failures.
+     *
+     * @param ClassMetadata $class
+     * @param array $id
+     * @return array
+     */
+    private function flattenIdentifier($class, $id)
+    {
+        $flatId = array();
+
+        foreach ($id as $idField => $idValue) {
+            if (isset($class->associationMappings[$idField])) {
+                $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']);
+                $associatedId        = $this->getEntityIdentifier($idValue);
+
+                $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]];
+            }
+        }
+
+        return $flatId;
+    }
+
     /**
      * Executes a merge operation on an entity.
      *
@@ -1735,19 +1771,9 @@ class UnitOfWork implements PropertyChangedListener
 
                 $this->persistNew($class, $managedCopy);
             } else {
-                $flatId = $id;
-                if ($class->containsForeignIdentifier) {
-                    // convert foreign identifiers into scalar foreign key
-                    // values to avoid object to string conversion failures.
-                    foreach ($id as $idField => $idValue) {
-                        if (isset($class->associationMappings[$idField])) {
-                            $targetClassMetadata = $this->em->getClassMetadata($class->associationMappings[$idField]['targetEntity']);
-                            $associatedId        = $this->getEntityIdentifier($idValue);
-
-                            $flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]];
-                        }
-                    }
-                }
+                $flatId = ($class->containsForeignIdentifier)
+                    ? $this->flattenIdentifier($class, $id)
+                    : $id;
 
                 $managedCopy = $this->tryGetById($flatId, $class->rootEntityName);
 
@@ -1807,7 +1833,7 @@ class UnitOfWork implements PropertyChangedListener
                             // do not merge fields marked lazy that have not been fetched.
                             continue;
                         } else if ( ! $assoc2['isCascadeMerge']) {
-                            if ($this->getEntityState($other, self::STATE_DETACHED) !== self::STATE_MANAGED) {
+                            if ($this->getEntityState($other) === self::STATE_DETACHED) {
                                 $targetClass = $this->em->getClassMetadata($assoc2['targetEntity']);
                                 $relatedId = $targetClass->getIdentifierValues($other);
 
@@ -1818,6 +1844,7 @@ class UnitOfWork implements PropertyChangedListener
                                     $this->registerManaged($other, $relatedId, array());
                                 }
                             }
+
                             $prop->setValue($managedCopy, $other);
                         }
                     } else {
@@ -2209,6 +2236,10 @@ class UnitOfWork implements PropertyChangedListener
      */
     public function lock($entity, $lockMode, $lockVersion = null)
     {
+        if ($entity === null) {
+            throw new \InvalidArgumentException("No entity passed to UnitOfWork#lock().");
+        }
+
         if ($this->getEntityState($entity, self::STATE_DETACHED) != self::STATE_MANAGED) {
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
@@ -2287,6 +2318,7 @@ class UnitOfWork implements PropertyChangedListener
             $this->collectionUpdates =
             $this->extraUpdates =
             $this->readOnlyObjects =
+            $this->visitedCollections =
             $this->orphanRemovals = array();
 
             if ($this->commitOrderCalculator !== null) {
@@ -2415,17 +2447,23 @@ class UnitOfWork implements PropertyChangedListener
                 if ($entity instanceof NotifyPropertyChanged) {
                     $entity->addPropertyChangedListener($this);
                 }
+
+                // inject ObjectManager into just loaded proxies.
+                if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+                    $entity->injectObjectManager($this->em, $class);
+                }
+
             } else {
                 $overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
 
                 // If only a specific entity is set to refresh, check that it's the one
                 if(isset($hints[Query::HINT_REFRESH_ENTITY])) {
                     $overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity;
+                }
 
-                    // inject ObjectManager into just loaded proxies.
-                    if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
-                        $entity->injectObjectManager($this->em, $class);
-                    }
+                // inject ObjectManager upon refresh.
+                if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
+                    $entity->injectObjectManager($this->em, $class);
                 }
             }
 
@@ -2529,7 +2567,7 @@ class UnitOfWork implements PropertyChangedListener
                             // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                             // then we can append this entity for eager loading!
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
-                                isset($hints['deferEagerLoad']) &&
+                                isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                                 !$targetClass->isIdentifierComposite &&
                                 $newValue instanceof Proxy &&
                                 $newValue->__isInitialized__ === false) {
@@ -2554,7 +2592,7 @@ class UnitOfWork implements PropertyChangedListener
                                     break;
 
                                 // Deferred eager load only works for single identifier classes
-                                case (isset($hints['deferEagerLoad']) && ! $targetClass->isIdentifierComposite):
+                                case (isset($hints[self::HINT_DEFEREAGERLOAD]) && ! $targetClass->isIdentifierComposite):
                                     // TODO: Is there a faster approach?
                                     $this->eagerLoadingEntities[$targetClass->rootEntityName][$relatedIdHash] = current($associatedId);
 
@@ -2671,6 +2709,8 @@ class UnitOfWork implements PropertyChangedListener
                 $persister->loadManyToManyCollection($assoc, $collection->getOwner(), $collection);
                 break;
         }
+
+        $collection->setInitialized(true);
     }
 
     /**

lib/Doctrine/ORM/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.3.2';
+    const VERSION = '2.3.5';
 
     /**
      * Compares a Doctrine version with the current one.

tests/Doctrine/Tests/Models/Taxi/Car.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Doctrine\Tests\Models\Taxi;
+
+/**
+ * @Entity
+ * @Table(name="taxi_car")
+ */
+class Car
+{
+    /**
+     * @Id
+     * @Column(type="string", length=25)
+     * @GeneratedValue(strategy="NONE")
+     */
+    private $brand;
+
+    /**
+     * @Column(type="string", length=255);
+     */
+    private $model;
+
+    /**
+     * @OneToMany(targetEntity="Ride", mappedBy="car")
+     */
+    private $freeCarRides;
+
+    /**
+     * @OneToMany(targetEntity="PaidRide", mappedBy="car")
+     */
+    private $carRides;
+
+    public function setBrand($brand)
+    {
+        $this->brand = $brand;
+    }
+
+    public function setModel($model)
+    {
+        $this->model = $model;
+    }
+}

tests/Doctrine/Tests/Models/Taxi/Driver.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Doctrine\Tests\Models\Taxi;
+
+/**
+ * @Entity
+ * @Table(name="taxi_driver")
+ */
+class Driver
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @Column(type="string", length=255);
+     */
+    private $name;
+
+    /**
+     * @OneToMany(targetEntity="Ride", mappedBy="driver")
+     */
+    private $freeDriverRides;
+
+    /**
+     * @OneToMany(targetEntity="PaidRide", mappedBy="driver")
+     */
+    private $driverRides;
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+}

tests/Doctrine/Tests/Models/Taxi/PaidRide.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Doctrine\Tests\Models\Taxi;
+
+/**
+ * Same as Ride but with an extra column that is not part of the composite primary key
+ *
+ * @Entity
+ * @Table(name="taxi_paid_ride")
+ */
+class PaidRide
+{
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="Driver", inversedBy="driverRides")
+     * @JoinColumn(name="driver_id", referencedColumnName="id")
+     */
+    private $driver;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="Car", inversedBy="carRides")
+     * @JoinColumn(name="car", referencedColumnName="brand")
+     */
+    private $car;
+
+    /**
+     * @Column(type="decimal", precision=6, scale=2)
+     */
+    private $fare;
+
+    public function __construct(Driver $driver, Car $car)
+    {
+        $this->driver = $driver;
+        $this->car = $car;
+    }
+
+    public function setFare($fare)
+    {
+        $this->fare = $fare;
+    }
+}

tests/Doctrine/Tests/Models/Taxi/Ride.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Doctrine\Tests\Models\Taxi;
+
+/**
+ * Test model that contains only Id-columns
+ *
+ * @Entity
+ * @Table(name="taxi_ride")
+ */
+class Ride
+{
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="Driver", inversedBy="freeDriverRides")
+     * @JoinColumn(name="driver_id", referencedColumnName="id")
+     */
+    private $driver;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="Car", inversedBy="freeCarRides")
+     * @JoinColumn(name="car", referencedColumnName="brand")
+     */
+    private $car;
+
+    public function __construct(Driver $driver, Car $car)
+    {
+        $this->driver = $driver;
+        $this->car = $car;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php

@@ -1118,7 +1118,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $user->username = 'domnikl';
         $user->status = 'developer';
 
-        $this->setExpectedException('InvalidArgumentException', 'Entity has to be managed for single computation');
+        $this->setExpectedException('InvalidArgumentException', 'Entity has to be managed or scheduled for removal for single computation');
         $this->_em->flush($user);
     }
 
@@ -1202,8 +1202,9 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
     /**
      * @group DDC-720
      * @group DDC-1612
+     * @group DDC-2267
      */
-    public function testFlushSingleNewEntity()
+    public function testFlushSingleNewEntityThenRemove()
     {
         $user = new CmsUser;
         $user->name = 'Dominik';
@@ -1212,6 +1213,14 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->persist($user);
         $this->_em->flush($user);
+
+        $userId = $user->id;
+
+        $this->_em->remove($user);
+        $this->_em->flush($user);
+        $this->_em->clear();
+
+        $this->assertNull($this->_em->find(get_class($user), $userId));
     }
 
     /**

tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php

@@ -2,12 +2,9 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-use Doctrine\ORM\Mapping\ClassMetadataInfo,
-    Doctrine\Common\Util\Inflector;
-
-class DatabaseDriverTest extends \Doctrine\Tests\OrmFunctionalTestCase
+class DatabaseDriverTest extends DatabaseDriverTestCase
 {
     /**
      * @var \Doctrine\DBAL\Schema\AbstractSchemaManager
@@ -148,44 +145,4 @@ class DatabaseDriverTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(0, count($metadatas['DbdriverBaz']->associationMappings), "no association mappings should be detected.");
     }
-
-    protected function convertToClassMetadata(array $entityTables, array $manyTables = array())
-    {
-        $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($this->_sm);
-        $driver->setTables($entityTables, $manyTables);
-
-        $metadatas = array();
-        foreach ($driver->getAllClassNames() AS $className) {
-            $class = new ClassMetadataInfo($className);
-            $driver->loadMetadataForClass($className, $class);
-            $metadatas[$className] = $class;
-        }
-
-        return $metadatas;
-    }
-
-    /**
-     * @param  string $className
-     * @return ClassMetadata
-     */
-    protected function extractClassMetadata(array $classNames)
-    {
-        $classNames = array_map('strtolower', $classNames);
-        $metadatas = array();
-
-        $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($this->_sm);
-        foreach ($driver->getAllClassNames() as $className) {
-            if (!in_array(strtolower($className), $classNames)) {
-                continue;
-            }
-            $class = new ClassMetadataInfo($className);
-            $driver->loadMetadataForClass($className, $class);
-            $metadatas[$className] = $class;
-        }
-
-        if (count($metadatas) != count($classNames)) {
-            $this->fail("Have not found all classes matching the names '" . implode(", ", $classNames) . "' only tables " . implode(", ", array_keys($metadatas)));
-        }
-        return $metadatas;
-    }
 }

tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
+
+/**
+ * Common BaseClass for DatabaseDriver Tests
+ */
+abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase
+{
+    protected function convertToClassMetadata(array $entityTables, array $manyTables = array())
+    {
+        $sm = $this->_em->getConnection()->getSchemaManager();
+        $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm);
+        $driver->setTables($entityTables, $manyTables);
+
+        $metadatas = array();
+        foreach ($driver->getAllClassNames() AS $className) {
+            $class = new ClassMetadataInfo($className);
+            $driver->loadMetadataForClass($className, $class);
+            $metadatas[$className] = $class;
+        }
+
+        return $metadatas;
+    }
+
+    /**
+     * @param  string $className
+     * @return ClassMetadata
+     */
+    protected function extractClassMetadata(array $classNames)
+    {
+        $classNames = array_map('strtolower', $classNames);
+        $metadatas = array();
+
+        $sm = $this->_em->getConnection()->getSchemaManager();
+        $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm);
+
+        foreach ($driver->getAllClassNames() as $className) {
+            if (!in_array(strtolower($className), $classNames)) {
+                continue;
+            }
+            $class = new ClassMetadataInfo($className);
+            $driver->loadMetadataForClass($className, $class);
+            $metadatas[$className] = $class;
+        }
+
+        if (count($metadatas) != count($classNames)) {
+            $this->fail("Have not found all classes matching the names '" . implode(", ", $classNames) . "' only tables " . implode(", ", array_keys($metadatas)));
+        }
+        return $metadatas;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php

@@ -84,4 +84,60 @@ class EntityRepositoryCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(2, count($dates));
     }
+
+    private function loadNullFieldFixtures()
+    {
+        $today = new DateTimeModel();
+        $today->datetime =
+        $today->date =
+            new \DateTime('today');
+
+        $this->_em->persist($today);
+
+        $tomorrow = new DateTimeModel();
+        $tomorrow->datetime =
+        $tomorrow->date =
+        $tomorrow->time =
+            new \DateTime('tomorrow');
+        $this->_em->persist($tomorrow);
+
+        $this->_em->flush();
+        $this->_em->clear();
+    }
+
+    public function testIsNullComparison()
+    {
+        $this->loadNullFieldFixtures();
+        $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel');
+
+        $dates = $repository->matching(new Criteria(
+            Criteria::expr()->isNull('time')
+        ));
+
+        $this->assertEquals(1, count($dates));
+    }
+
+    public function testEqNullComparison()
+    {
+        $this->loadNullFieldFixtures();
+        $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel');
+
+        $dates = $repository->matching(new Criteria(
+            Criteria::expr()->eq('time', null)
+        ));
+
+        $this->assertEquals(1, count($dates));
+    }
+
+    public function testNotEqNullComparison()
+    {
+        $this->loadNullFieldFixtures();
+        $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel');
+
+        $dates = $repository->matching(new Criteria(
+            Criteria::expr()->neq('time', null)
+        ));
+
+        $this->assertEquals(1, count($dates));
+    }
 }

tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php

@@ -7,6 +7,8 @@ use Doctrine\ORM\OptimisticLockException;
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\Tests\TestUtil;
+use Doctrine\DBAL\LockMode;
+use DateTime;
 
 require_once __DIR__ . '/../../../TestInit.php';
 
@@ -181,13 +183,44 @@ class OptimisticTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_conn->executeQuery('UPDATE optimistic_timestamp SET version = ? WHERE id = ?', array(date($format, strtotime($test->version->format($format)) + 3600), $test->id));
 
         // Try and update the record and it should throw an exception
+        $caughtException = null;
         $test->name = 'Testing again';
         try {
             $this->_em->flush();
         } catch (OptimisticLockException $e) {
-            $this->assertSame($test, $e->getEntity());
+            $caughtException = $e;
         }
+
+        $this->assertNotNull($caughtException, "No OptimisticLockingException was thrown");
+        $this->assertSame($test, $caughtException->getEntity());
+
     }
+
+    /**
+     * @depends testOptimisticTimestampSetsDefaultValue
+     */
+    public function testOptimisticTimestampLockFailureThrowsException(OptimisticTimestamp $entity)
+    {
+        $q = $this->_em->createQuery('SELECT t FROM Doctrine\Tests\ORM\Functional\Locking\OptimisticTimestamp t WHERE t.id = :id');
+        $q->setParameter('id', $entity->id);
+        $test = $q->getSingleResult();
+
+        $this->assertInstanceOf('DateTime', $test->version);
+
+        // Try to lock the record with an older timestamp and it should throw an exception
+        $caughtException = null;
+        try {
+            $expectedVersionExpired = DateTime::createFromFormat('U', $test->version->getTimestamp()-3600);
+            $this->_em->lock($test, LockMode::OPTIMISTIC, $expectedVersionExpired);
+        } catch (OptimisticLockException $e) {
+            $caughtException = $e;
+        }
+
+        $this->assertNotNull($caughtException, "No OptimisticLockingException was thrown");
+        $this->assertSame($test, $caughtException->getEntity());
+
+    }
+
 }
 
 /**

tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php

@@ -173,14 +173,36 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona
         $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results);
         $this->assertEquals(2, count($results));
     }
-	
+
+    /**
+     * @group DDC-2340
+     */
+    public function testMatchingOnDirtyCollection()
+    {
+        $this->_createFixture();
+
+        $product  = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId());
+
+        $thirdFeature = new ECommerceFeature();
+        $thirdFeature->setDescription('Model writing tutorial');
+
+        $features = $product->getFeatures();
+        $features->add($thirdFeature);
+
+        $results = $features->matching(new Criteria(
+            Criteria::expr()->eq('description', 'Model writing tutorial')
+        ));
+
+        $this->assertEquals(2, count($results));
+    }
+
     public function testMatchingBis()
     {
         $this->_createFixture();
 
         $product  = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId());
         $features = $product->getFeatures();
-        
+
         $thirdFeature = new ECommerceFeature();
         $thirdFeature->setDescription('Third feature');
         $product->addFeature($thirdFeature);

tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\SchemaTool;
+
+use Doctrine\ORM\Tools;
+
+class DBAL483Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $conn = $this->_em->getConnection();
+
+        if ($conn->getDatabasePlatform()->getName() === 'sqlite') {
+            $this->markTestSkipped('Sqlite does not support ALTER TABLE');
+        }
+
+        $this->schemaTool = new Tools\SchemaTool($this->_em);
+    }
+
+    /**
+     * @group DBAL-483
+     */
+    public function testDefaultValueIsComparedCorrectly()
+    {
+        $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DBAL483Default');
+
+        $this->schemaTool->createSchema(array($class));
+
+        $updateSql = $this->schemaTool->getUpdateSchemaSql(array($class));
+
+        $updateSql = array_filter($updateSql, function ($sql) {
+            return strpos($sql, 'DBAL483') !== false;
+        });
+
+        $this->assertEquals(0, count($updateSql));
+    }
+}
+
+/**
+ * @Entity
+ */
+class DBAL483Default
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @Column(type="integer", options={"default": 0})
+     */
+    public $num;
+
+    /**
+     * @Column(type="string", options={"default": "foo"})
+     */
+    public $str = "foo";
+}

tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php

@@ -4,9 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 
 use Doctrine\ORM\Tools;
 
-
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * WARNING: This test should be run as last test! It can affect others very easily!
  */
@@ -15,7 +12,8 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
     private $classes = array();
     private $schemaTool = null;
 
-    public function setUp() {
+    public function setUp()
+    {
         parent::setUp();
 
         $conn = $this->_em->getConnection();
@@ -88,4 +86,4 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(0, count($sql), "SQL: " . implode(PHP_EOL, $sql));
     }
-}
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php

@@ -461,4 +461,22 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals($before + 3, count($data));
     }
+
+    /**
+     * @group DDC-2246
+     */
+    public function testGetEntityState()
+    {
+        $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id());
+        $this->article2 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article2->id());
+
+        $this->reference = new DDC117Reference($this->article2, $this->article1, "Test-Description");
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference));
+
+        $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id());
+        $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria);
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference));
+    }
 }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1666Test.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsEmail;
+
+/**
+ * @group DDC-1666
+ */
+class DDC1666Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testGivenOrphanRemovalOneToOne_WhenReplacing_ThenNoUniqueConstraintError()
+    {
+        $user = new CmsUser();
+        $user->name = "Benjamin";
+        $user->username = "beberlei";
+        $user->status = "something";
+        $user->setEmail($email = new CmsEmail());
+        $email->setEmail("kontakt@beberlei.de");
+
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $this->assertTrue($this->_em->contains($email));
+
+        $user->setEmail($newEmail = new CmsEmail());
+        $newEmail->setEmail("benjamin.eberlei@googlemail.com");
+
+        $this->_em->flush();
+
+        $this->assertFalse($this->_em->contains($email));
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php

@@ -0,0 +1,158 @@
+<?php
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\Taxi\Car,
+    Doctrine\Tests\Models\Taxi\Driver,
+    Doctrine\Tests\Models\Taxi\Ride,
+    Doctrine\Tests\Models\Taxi\PaidRide;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1884
+ * @author Sander Coolen <sander@jibber.nl>
+ */
+class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        $this->useModelSet('taxi');
+        parent::setUp();
+
+        list($bimmer, $crysler, $merc, $volvo) = $this->createCars('Doctrine\Tests\Models\Taxi\Car');
+        list($john, $foo) = $this->createDrivers('Doctrine\Tests\Models\Taxi\Driver');
+        $this->_em->flush();
+
+        $ride1 = new Ride($john, $bimmer);
+        $ride2 = new Ride($john, $merc);
+        $ride3 = new Ride($john, $volvo);
+        $ride4 = new Ride($foo, $merc);
+
+        $this->_em->persist($ride1);
+        $this->_em->persist($ride2);
+        $this->_em->persist($ride3);
+        $this->_em->persist($ride4);
+
+        $ride5 = new PaidRide($john, $bimmer);
+        $ride5->setFare(10.50);
+
+        $ride6 = new PaidRide($john, $merc);
+        $ride6->setFare(16.00);
+
+        $ride7 = new PaidRide($john, $volvo);
+        $ride7->setFare(20.70);
+
+        $ride8 = new PaidRide($foo, $merc);
+        $ride8->setFare(32.15);
+
+        $this->_em->persist($ride5);
+        $this->_em->persist($ride6);
+        $this->_em->persist($ride7);
+        $this->_em->persist($ride8);
+
+        $this->_em->flush();
+    }
+
+    private function createCars($class)
+    {
+        $bimmer = new $class;
+        $bimmer->setBrand('BMW');
+        $bimmer->setModel('7-Series');
+
+        $crysler = new $class;
+        $crysler->setBrand('Crysler');
+        $crysler->setModel('300');
+
+        $merc = new $class;
+        $merc->setBrand('Mercedes');
+        $merc->setModel('C-Class');
+
+        $volvo = new $class;
+        $volvo->setBrand('Volvo');
+        $volvo->setModel('XC90');
+
+        $this->_em->persist($bimmer);
+        $this->_em->persist($crysler);
+        $this->_em->persist($merc);
+        $this->_em->persist($volvo);
+
+        return array($bimmer, $crysler, $merc, $volvo);
+    }
+
+    private function createDrivers($class)
+    {
+        $john = new $class;
+        $john->setName('John Doe');
+
+        $foo = new $class;
+        $foo->setName('Foo Bar');
+
+        $this->_em->persist($foo);
+        $this->_em->persist($john);
+
+        return array($john, $foo);
+    }
+
+    /**
+     * 1) Ride contains only columns that are part of its composite primary key
+     * 2) We use fetch joins here
+     */
+    public function testSelectFromInverseSideWithCompositePkAndSolelyIdentifierColumnsUsingFetchJoins()
+    {
+        $qb = $this->_em->createQueryBuilder();
+
+        $result = $qb->select('d, dr, c')
+            ->from('Doctrine\Tests\Models\Taxi\Driver', 'd')
+            ->leftJoin('d.freeDriverRides', 'dr')
+            ->leftJoin('dr.car', 'c')
+            ->where('d.name = ?1')
+            ->setParameter(1, 'John Doe')
+            ->getQuery()
+            ->getArrayResult();
+
+        $this->assertCount(1, $result);
+        $this->assertArrayHasKey('freeDriverRides', $result[0]);
+        $this->assertCount(3, $result[0]['freeDriverRides']);
+    }
+
+    /**
+     * 1) PaidRide contains an extra column that is not part of the composite primary key
+     * 2) Again we will use fetch joins
+     */
+    public function testSelectFromInverseSideWithCompositePkUsingFetchJoins()
+    {
+        $qb = $this->_em->createQueryBuilder();
+
+        $result = $qb->select('d, dr, c')
+            ->from('Doctrine\Tests\Models\Taxi\Driver', 'd')
+            ->leftJoin('d.driverRides', 'dr')
+            ->leftJoin('dr.car', 'c')
+            ->where('d.name = ?1')
+            ->setParameter(1, 'John Doe')
+            ->getQuery()->getArrayResult();
+
+        $this->assertCount(1, $result);
+        $this->assertArrayHasKey('driverRides', $result[0]);
+        $this->assertCount(3, $result[0]['driverRides']);
+    }
+
+    /**
+     * The other way around will fail too
+     */
+    public function testSelectFromOwningSideUsingFetchJoins()
+    {
+        $qb = $this->_em->createQueryBuilder();
+
+        $result =  $qb->select('r, d, c')
+            ->from('Doctrine\Tests\Models\Taxi\PaidRide', 'r')
+            ->leftJoin('r.driver', 'd')
+            ->leftJoin('r.car', 'c')
+            ->where('d.name = ?1')
+            ->setParameter(1, 'John Doe')
+            ->getQuery()->getArrayResult();
+
+        $this->assertCount(3, $result);
+        $this->assertArrayHasKey('driver', $result[0]);
+        $this->assertArrayHasKey('car', $result[0]);
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\Company\CompanyEmployee;
+
+/**
+ * @group DDC-2090
+ */
+class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('company');
+        parent::setUp();
+    }
+
+    public function testIssue()
+    {
+        $className = 'Doctrine\Tests\Models\Company\CompanyEmployee';
+        $date1     = new \DateTime('2011-11-11 11:11:11');
+        $date2     = new \DateTime('2012-12-12 12:12:12');
+        $employee1 = new CompanyEmployee;
+        $employee2 = new CompanyEmployee;
+
+        $employee1->setName("Fabio B. Silva");
+        $employee1->setStartDate(new \DateTime('yesterday'));
+        $employee1->setDepartment("R&D");
+        $employee1->setSalary(100);
+
+        $employee2->setName("Doctrine Bot");
+        $employee1->setStartDate(new \DateTime('yesterday'));
+        $employee2->setDepartment("QA");
+        $employee2->setSalary(100);
+
+        $this->_em->persist($employee1);
+        $this->_em->persist($employee2);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->_em->createQueryBuilder()
+            ->update($className, 'e')
+            ->set('e.startDate', ':date')
+            ->set('e.salary', ':salary')
+            ->where('e = :e')
+            ->setParameters(array(
+                'e'      => $employee1,
+                'date'   => $date1,
+                'salary' => 101,
+            ))
+            ->getQuery()
+            ->useQueryCache(true)
+            ->execute();
+
+        $this->_em->createQueryBuilder()
+            ->update($className, 'e')
+            ->set('e.startDate', ':date')
+            ->set('e.salary', ':salary')
+            ->where('e = :e')
+            ->setParameters(array(
+                'e'      => $employee2,
+                'date'   => $date2,
+                'salary' => 102,
+            ))
+            ->getQuery()
+            ->useQueryCache(true)
+            ->execute();
+
+        $this->_em->clear();
+
+        $e1 = $this->_em->find($className, $employee1->getId());
+        $e2 = $this->_em->find($className, $employee2->getId());
+
+        $this->assertEquals(101, $e1->getSalary());
+        $this->assertEquals(102, $e2->getSalary());
+        $this->assertEquals($date1, $e1->getStartDate());
+        $this->assertEquals($date2, $e2->getStartDate());
+
+        $this->_em->createQueryBuilder()
+            ->update($className, 'e')
+            ->set('e.startDate', '?1')
+            ->set('e.salary', '?2')
+            ->where('e = ?0')
+            ->setParameters(array($employee1, $date1, 101))
+            ->getQuery()
+            ->useQueryCache(true)
+            ->execute();
+
+        $this->_em->createQueryBuilder()
+            ->update($className, 'e')
+            ->set('e.startDate', '?1')
+            ->set('e.salary', '?2')
+            ->where('e = ?0')
+            ->setParameters(array($employee2, $date2, 102))
+            ->getQuery()
+            ->useQueryCache(true)
+            ->execute();
+
+
+        $this->_em->clear();
+
+        $e1 = $this->_em->find($className, $employee1->getId());
+        $e2 = $this->_em->find($className, $employee2->getId());
+
+        $this->assertEquals(101, $e1->getSalary());
+        $this->assertEquals(102, $e2->getSalary());
+        $this->assertEquals($date1, $e1->getStartDate());
+        $this->assertEquals($date2, $e2->getStartDate());
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Doctrine\Common\Persistence\ObjectManagerAware;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-2231
+ */
+class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2231EntityY'),
+        ));
+    }
+
+    public function testInjectObjectManagerInProxyIfInitializedInUow()
+    {
+        $y1 = new DDC2231EntityY;
+
+        $this->_em->persist($y1);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $y1ref = $this->_em->getReference(get_class($y1), $y1->id);
+
+        $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $y1ref);
+        $this->assertFalse($y1ref->__isInitialized__);
+
+        $id = $y1ref->doSomething();
+
+        $this->assertTrue($y1ref->__isInitialized__);
+        $this->assertEquals($this->_em, $y1ref->om);
+    }
+}
+
+
+/** @Entity @Table(name="ddc2231_y") */
+class DDC2231EntityY implements ObjectManagerAware
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     */
+    public $id;
+
+    public $om;
+
+    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
+    {
+        $this->om = $objectManager;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function doSomething()
+    {
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php

@@ -0,0 +1,229 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+/**
+ * @group DDC-2252
+ */
+class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    private $user;
+    private $merchant;
+    private $membership;
+    private $privileges = array();
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252User'),
+            $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Privilege'),
+            $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'),
+            $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252MerchantAccount'),
+        ));
+
+        $this->loadFixtures();
+    }
+
+    public function loadFixtures()
+    {
+        $this->user         = new DDC2252User;
+        $this->merchant     = new DDC2252MerchantAccount;
+        $this->membership   = new DDC2252Membership($this->user, $this->merchant);
+
+        $this->privileges[] = new DDC2252Privilege;
+        $this->privileges[] = new DDC2252Privilege;
+        $this->privileges[] = new DDC2252Privilege;
+
+        $this->membership->addPrivilege($this->privileges[0]);
+        $this->membership->addPrivilege($this->privileges[1]);
+        $this->membership->addPrivilege($this->privileges[2]);
+
+        $this->_em->persist($this->user);
+        $this->_em->persist($this->merchant);
+        $this->_em->persist($this->privileges[0]);
+        $this->_em->persist($this->privileges[1]);
+        $this->_em->persist($this->privileges[2]);
+        $this->_em->flush();
+
+        $this->_em->persist($this->membership);
+        $this->_em->flush();
+        $this->_em->clear();
+    }
+
+    public function testIssue()
+    {
+        $identifier = array(
+            'merchantAccount' => $this->merchant->getAccountid(),
+            'userAccount'     => $this->user->getUid(),
+        );
+
+        $class      = 'Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership';
+        $membership = $this->_em->find($class, $identifier);
+
+        $this->assertInstanceOf($class, $membership);
+        $this->assertCount(3, $membership->getPrivileges());
+
+        $membership->getPrivileges()->remove(2);
+        $this->_em->persist($membership);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $membership = $this->_em->find($class, $identifier);
+
+        $this->assertInstanceOf($class, $membership);
+        $this->assertCount(2, $membership->getPrivileges());
+
+        $membership->getPrivileges()->clear();
+        $this->_em->persist($membership);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $membership = $this->_em->find($class, $identifier);
+
+        $this->assertInstanceOf($class, $membership);
+        $this->assertCount(0, $membership->getPrivileges());
+
+        $membership->addPrivilege($privilege3 = new DDC2252Privilege);
+        $this->_em->persist($privilege3);
+        $this->_em->persist($membership);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $membership = $this->_em->find($class, $identifier);
+
+        $this->assertInstanceOf($class, $membership);
+        $this->assertCount(1, $membership->getPrivileges());
+    }
+}
+
+/**
+ * @Entity()
+ * @Table(name="ddc2252_acl_privilege")
+ */
+class DDC2252Privilege
+{
+    /**
+     * @Id
+     * @GeneratedValue
+     * @Column(type="integer")
+     */
+    protected $privilegeid;
+
+    public function getPrivilegeid()
+    {
+        return $this->privilegeid;
+    }
+}
+
+/**
+ * @Entity
+ * @Table(name="ddc2252_mch_account")
+ */
+class DDC2252MerchantAccount
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     */
+    protected $accountid = 111;
+
+    public function getAccountid()
+    {
+        return $this->accountid;
+    }
+}
+
+/**
+ * @Entity
+ * @Table(name="ddc2252_user_account")
+ */
+class DDC2252User {
+    /**
+     * @Id
+     * @Column(type="integer")
+     */
+    protected $uid = 222;
+
+    /**
+     * @OneToMany(targetEntity="DDC2252Membership", mappedBy="userAccount", cascade={"persist"})
+     * @JoinColumn(name="uid", referencedColumnName="uid")
+     */
+    protected $memberships;
+
+    public function __construct()
+    {
+        $this->memberships = new ArrayCollection;
+    }
+
+    public function getUid()
+    {
+        return $this->uid;
+    }
+
+    public function getMemberships()
+    {
+        return $this->memberships;
+    }
+
+    public function addMembership(DDC2252Membership $membership)
+    {
+        $this->memberships[] = $membership;
+    }
+}
+
+/**
+ * @Entity
+ * @Table(name="ddc2252_mch_account_member")
+ * @HasLifecycleCallbacks
+ */
+class DDC2252Membership
+{
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="DDC2252User", inversedBy="memberships")
+     * @JoinColumn(name="uid", referencedColumnName="uid")
+     */
+    protected $userAccount;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="DDC2252MerchantAccount")
+     * @JoinColumn(name="mch_accountid", referencedColumnName="accountid")
+     */
+    protected $merchantAccount;
+
+    /**
+     * @ManyToMany(targetEntity="DDC2252Privilege", indexBy="privilegeid")
+     * @JoinTable(name="ddc2252_user_mch_account_privilege",
+     *   joinColumns={
+     *       @JoinColumn(name="mch_accountid", referencedColumnName="mch_accountid"),
+     *       @JoinColumn(name="uid", referencedColumnName="uid")
+     *   },
+     *   inverseJoinColumns={
+     *       @JoinColumn(name="privilegeid", referencedColumnName="privilegeid")
+     *   }
+     * )
+     */
+    protected $privileges;
+
+    public function __construct(DDC2252User $user, DDC2252MerchantAccount $merchantAccount)
+    {
+        $this->userAccount      = $user;
+        $this->merchantAccount  = $merchantAccount;
+        $this->privileges       = new ArrayCollection();
+    }
+
+    public function addPrivilege($privilege)
+    {
+        $this->privileges[] = $privilege;
+    }
+
+    public function getPrivileges()
+    {
+        return $this->privileges;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Logging\DebugStack;
+
+/**
+ * @group DDC-2346
+ */
+class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    /**
+     * @var \Doctrine\DBAL\Logging\DebugStack
+     */
+    protected $logger;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setup()
+    {
+        parent::setup();
+
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Foo'),
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Bar'),
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Baz'),
+        ));
+
+        $this->logger = new DebugStack();
+    }
+
+    /**
+     * Verifies that fetching a OneToMany association with fetch="EAGER" does not cause N+1 queries
+     */
+    public function testIssue()
+    {
+        $foo1        = new DDC2346Foo();
+        $foo2        = new DDC2346Foo();
+
+        $baz1        = new DDC2346Baz();
+        $baz2        = new DDC2346Baz();
+
+        $baz1->foo   = $foo1;
+        $baz2->foo   = $foo2;
+
+        $foo1->bars[] = $baz1;
+        $foo1->bars[] = $baz2;
+
+        $this->_em->persist($foo1);
+        $this->_em->persist($foo2);
+        $this->_em->persist($baz1);
+        $this->_em->persist($baz2);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->_em->getConnection()->getConfiguration()->setSQLLogger($this->logger);
+
+        $fetchedBazs = $this->_em->getRepository(__NAMESPACE__ . '\\DDC2346Baz')->findAll();
+
+        $this->assertCount(2, $fetchedBazs);
+        $this->assertCount(2, $this->logger->queries, 'The total number of executed queries is 2, and not n+1');
+    }
+}
+
+/** @Entity */
+class DDC2346Foo
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /**
+     * @var DDC2346Bar[]|\Doctrine\Common\Collections\Collection
+     *
+     * @OneToMany(targetEntity="DDC2346Bar", mappedBy="foo")
+     */
+    public $bars;
+
+    /** Constructor */
+    public function __construct() {
+        $this->bars = new ArrayCollection();
+    }
+}
+
+/**
+ * @Entity
+ * @InheritanceType("JOINED")
+ * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorMap({"baz" = "DDC2346Baz"})
+ */
+class DDC2346Bar
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @ManyToOne(targetEntity="DDC2346Foo", inversedBy="bars", fetch="EAGER") */
+    public $foo;
+}
+
+
+/**
+ * @Entity
+ */
+class DDC2346Baz extends DDC2346Bar
+{
+
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group DDC-2350
+ */
+class DDC2350Test extends OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350User'),
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350Bug'),
+        ));
+    }
+
+    public function testEagerCollectionsAreOnlyRetrievedOnce()
+    {
+        $user = new DDC2350User();
+        $bug1 = new DDC2350Bug();
+        $bug1->user = $user;
+        $bug2 = new DDC2350Bug();
+        $bug2->user = $user;
+
+        $this->_em->persist($user);
+        $this->_em->persist($bug1);
+        $this->_em->persist($bug2);
+        $this->_em->flush();
+
+        $this->_em->clear();
+
+        $cnt = $this->getCurrentQueryCount();
+        $user = $this->_em->find(__NAMESPACE__ . '\DDC2350User', $user->id);
+
+        $this->assertEquals($cnt + 2, $this->getCurrentQueryCount());
+
+        $this->assertEquals(2, count($user->reportedBugs));
+
+        $this->assertEquals($cnt + 2, $this->getCurrentQueryCount());
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC2350User
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+    /** @OneToMany(targetEntity="DDC2350Bug", mappedBy="user", fetch="EAGER") */
+    public $reportedBugs;
+}
+
+/**
+ * @Entity
+ */
+class DDC2350Bug
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+    /** @ManyToOne(targetEntity="DDC2350User", inversedBy="reportedBugs") */
+    public $user;
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\ORM\Functional\DatabaseDriverTestCase;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
+
+class DDC2387Test extends DatabaseDriverTestCase
+{
+    /**
+     * @group DDC-2387
+     */
+    public function testCompositeAssociationKeyDetection()
+    {
+        $product = new \Doctrine\DBAL\Schema\Table('ddc2387_product');
+        $product->addColumn('id', 'integer');
+        $product->setPrimaryKey(array('id'));
+
+        $attributes = new \Doctrine\DBAL\Schema\Table('ddc2387_attributes');
+        $attributes->addColumn('product_id', 'integer');
+        $attributes->addColumn('attribute_name', 'string');
+        $attributes->setPrimaryKey(array('product_id', 'attribute_name'));
+        $attributes->addForeignKeyConstraint('ddc2387_product', array('product_id'), array('product_id'));
+
+        $metadata = $this->convertToClassMetadata(array($product, $attributes), array());
+
+        $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_NONE, $metadata['Ddc2387Attributes']->generatorType);
+        $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_AUTO, $metadata['Ddc2387Product']->generatorType);
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2409Test.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\UnitOfWork;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+
+/**
+ * @group DDC-2409
+ */
+class DDC2409Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testIssue()
+    {
+        $em     = $this->_em;
+        $uow    = $em->getUnitOfWork();
+        
+        $originalArticle  = new CmsArticle();
+        $originalUser     = new CmsUser();
+
+        $originalArticle->topic = 'Unit Test';
+        $originalArticle->text  = 'How to write a test';
+
+        $originalUser->name     = 'Doctrine Bot';
+        $originalUser->username = 'DoctrineBot';
+        $originalUser->status   = 'active';
+
+        $originalUser->addArticle($originalArticle);
+
+        $em->persist($originalUser);
+        $em->persist($originalArticle);
+        $em->flush();
+        $em->clear();
+
+        $article  = $em->find('Doctrine\Tests\Models\CMS\CmsArticle', $originalArticle->id);
+        $user     = new CmsUser();
+
+        $user->name     = 'Doctrine Bot 2.0';
+        $user->username = 'BotDoctrine2';
+        $user->status   = 'new';
+
+        $article->setAuthor($user);
+
+        $this->assertEquals(UnitOfWork::STATE_DETACHED, $uow->getEntityState($originalArticle));
+        $this->assertEquals(UnitOfWork::STATE_DETACHED, $uow->getEntityState($originalUser));
+        $this->assertEquals(UnitOfWork::STATE_MANAGED, $uow->getEntityState($article));
+        $this->assertEquals(UnitOfWork::STATE_NEW, $uow->getEntityState($user));
+
+        $em->detach($user);
+        $em->detach($article);
+
+        $userMerged     = $em->merge($user);
+        $articleMerged  = $em->merge($article);
+
+        $this->assertEquals(UnitOfWork::STATE_NEW, $uow->getEntityState($user));
+        $this->assertEquals(UnitOfWork::STATE_DETACHED, $uow->getEntityState($article));
+        $this->assertEquals(UnitOfWork::STATE_MANAGED, $uow->getEntityState($userMerged));
+        $this->assertEquals(UnitOfWork::STATE_MANAGED, $uow->getEntityState($articleMerged));
+
+        $this->assertNotSame($user, $userMerged);
+        $this->assertNotSame($article, $articleMerged);
+        $this->assertNotSame($userMerged, $articleMerged->user);
+        $this->assertSame($user, $articleMerged->user);
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+
+/**
+ * @group DDC-2579
+ */
+class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        Type::addType(DDC2579Type::NAME, DDC2579Type::CLASSNAME);
+
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(DDC2579Entity::CLASSNAME),
+            $this->_em->getClassMetadata(DDC2579EntityAssoc::CLASSNAME),
+            $this->_em->getClassMetadata(DDC2579AssocAssoc::CLASSNAME),
+        ));
+    }
+
+    public function testIssue()
+    {
+        $id         = new DDC2579Id("foo");
+        $assoc      = new DDC2579AssocAssoc($id);
+        $assocAssoc = new DDC2579EntityAssoc($assoc);
+        $entity     = new DDC2579Entity($assocAssoc);
+        $repository = $this->_em->getRepository(DDC2579Entity::CLASSNAME);
+
+        $this->_em->persist($assoc);
+        $this->_em->persist($assocAssoc);
+        $this->_em->persist($entity);
+        $this->_em->flush();
+        
+        $entity->value++;
+
+        $this->_em->persist($entity);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $id       = $entity->id;
+        $value    = $entity->value;
+        $criteria = array('assoc' => $assoc, 'id' => $id);
+        $entity   = $repository->findOneBy($criteria);
+
+        $this->assertInstanceOf(DDC2579Entity::CLASSNAME, $entity);
+        $this->assertEquals($value, $entity->value);
+
+        $this->_em->remove($entity);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->assertNull($repository->findOneBy($criteria));
+        $this->assertCount(0, $repository->findAll());
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC2579Entity
+{
+
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id
+     * @Column(type="ddc2579")
+     */
+    public $id;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="DDC2579EntityAssoc")
+     * @JoinColumn(name="relation_id", referencedColumnName="association_id")
+     */
+    public $assoc;
+
+    /**
+     * @Column(type="integer")
+     */
+    public $value;
+
+    public function __construct(DDC2579EntityAssoc $assoc, $value = 0)
+    {
+        $this->id    = $assoc->assocAssoc->associationId;
+        $this->assoc = $assoc;
+        $this->value = $value;
+    }
+
+}
+
+/**
+ * @Entity
+ */
+class DDC2579EntityAssoc
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="DDC2579AssocAssoc")
+     * @JoinColumn(name="association_id", referencedColumnName="associationId")
+     */
+    public $assocAssoc;
+
+    public function __construct(DDC2579AssocAssoc $assocAssoc)
+    {
+        $this->assocAssoc = $assocAssoc;
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC2579AssocAssoc
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id
+     * @Column(type="ddc2579")
+     */
+    public $associationId;
+
+    public function __construct(DDC2579Id $id)
+    {
+        $this->associationId  = $id;
+    }
+}
+
+
+class DDC2579Type extends StringType
+{
+    const NAME = 'ddc2579';
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    {
+        return (string)$value;
+    }
+
+    public function convertToPhpValue($value, AbstractPlatform $platform)
+    {
+        return new DDC2579Id($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+}
+
+class DDC2579Id
+{
+    const CLASSNAME = __CLASS__;
+
+    private $val;
+
+    public function __construct($val)
+    {
+        $this->val = $val;
+    }
+
+    public function __toString()
+    {
+        return $this->val;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Doctrine\Common\Collections\ArrayCollection;
+
+/**
+ * @group
+ */
+class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    protected function setup()
+    {
+        parent::setup();
+
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Product'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Customer'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder')
+            ));
+        } catch(\Exception $e) {
+            return;
+        }
+
+        for ($i = 0; $i < 5; $i++) {
+            $product = new DDC2660Product();
+            $customer = new DDC2660Customer();
+            $order = new DDC2660CustomerOrder($product, $customer, 'name' . $i);
+
+            $this->_em->persist($product);
+            $this->_em->persist($customer);
+            $this->_em->flush();
+
+            $this->_em->persist($order);
+            $this->_em->flush();
+        }
+
+        $this->_em->clear();
+    }
+
+    public function testIssueWithExtraColumn()
+    {
+        $sql = "SELECT o.product_id, o.customer_id, o.name FROM ddc_2660_customer_order o";
+
+        $rsm = new ResultSetMappingBuilder($this->_getEntityManager());
+        $rsm->addRootEntityFromClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder', 'c');
+
+        $query  = $this->_em->createNativeQuery($sql, $rsm);
+        $result = $query->getResult();
+
+        $this->assertCount(5, $result);
+
+        foreach ($result as $order) {
+            $this->assertNotNull($order);
+            $this->assertInstanceOf(__NAMESPACE__ . '\\DDC2660CustomerOrder', $order);
+        }
+    }
+
+    public function testIssueWithoutExtraColumn()
+    {
+        $sql = "SELECT o.product_id, o.customer_id FROM ddc_2660_customer_order o";
+
+        $rsm = new ResultSetMappingBuilder($this->_getEntityManager());
+        $rsm->addRootEntityFromClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder', 'c');
+
+        $query  = $this->_em->createNativeQuery($sql, $rsm);
+        $result = $query->getResult();
+
+        $this->assertCount(5, $result);
+
+        foreach ($result as $order) {
+            $this->assertNotNull($order);
+            $this->assertInstanceOf(__NAMESPACE__ . '\\DDC2660CustomerOrder', $order);
+        }
+    }
+}
+/**
+ * @Entity @Table(name="ddc_2660_product")
+ */
+class DDC2660Product
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+}
+
+/** @Entity  @Table(name="ddc_2660_customer") */
+class DDC2660Customer
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+}
+
+/** @Entity @Table(name="ddc_2660_customer_order") */
+class DDC2660CustomerOrder
+{
+    /**
+     * @Id @ManyToOne(targetEntity="DDC2660Product")
+     */
+    public $product;
+
+    /**
+     * @Id @ManyToOne(targetEntity="DDC2660Customer")
+     */
+    public $customer;
+
+    /**
+     * @Column(type="string")
+     */
+    public $name;
+
+    public function __construct(DDC2660Product $product, DDC2660Customer $customer, $name)
+    {
+        $this->product  = $product;
+        $this->customer = $customer;
+        $this->name = $name;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+/**
+ * @group DDC-2759
+ */
+class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    protected function setup()
+    {
+        parent::setup();
+
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Qualification'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Category'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759QualificationMetadata'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759MetadataCategory'),
+            ));
+        } catch(\Exception $e) {
+            return;
+        }
+
+        $qualification = new DDC2759Qualification();
+        $qualificationMetadata = new DDC2759QualificationMetadata($qualification);
+
+        $category1 = new DDC2759Category();
+        $category2 = new DDC2759Category();
+
+        $metadataCategory1 = new DDC2759MetadataCategory($qualificationMetadata, $category1);
+        $metadataCategory2 = new DDC2759MetadataCategory($qualificationMetadata, $category2);
+
+        $this->_em->persist($qualification);
+        $this->_em->persist($qualificationMetadata);
+
+        $this->_em->persist($category1);
+        $this->_em->persist($category2);
+
+        $this->_em->persist($metadataCategory1);
+        $this->_em->persist($metadataCategory2);
+
+        $this->_em->flush();
+        $this->_em->clear();
+    }
+
+    public function testCorrectNumberOfAssociationsIsReturned()
+    {
+        $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC2759Qualification');
+
+        $builder = $repository->createQueryBuilder('q')
+            ->select('q, qm, qmc')
+            ->innerJoin('q.metadata', 'qm')
+            ->innerJoin('qm.metadataCategories', 'qmc');
+
+        $result = $builder->getQuery()
+            ->getArrayResult();
+
+        $this->assertCount(2, $result[0]['metadata']['metadataCategories']);
+    }
+}
+
+/** @Entity  @Table(name="ddc_2759_qualification") */
+class DDC2759Qualification
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @OneToOne(targetEntity="DDC2759QualificationMetadata", mappedBy="content") */
+    public $metadata;
+}
+
+/** @Entity  @Table(name="ddc_2759_category") */
+class DDC2759Category
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @OneToMany(targetEntity="DDC2759MetadataCategory", mappedBy="category") */
+    public $metadataCategories;
+}
+
+/** @Entity  @Table(name="ddc_2759_qualification_metadata") */
+class DDC2759QualificationMetadata
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @OneToOne(targetEntity="DDC2759Qualification", inversedBy="metadata") */
+    public $content;
+
+    /** @OneToMany(targetEntity="DDC2759MetadataCategory", mappedBy="metadata") */
+    protected $metadataCategories;
+
+    public function __construct(DDC2759Qualification $content)
+    {
+        $this->content = $content;
+    }
+}
+
+/** @Entity  @Table(name="ddc_2759_metadata_category") */
+class DDC2759MetadataCategory
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+
+    /** @ManyToOne(targetEntity="DDC2759QualificationMetadata", inversedBy="metadataCategories") */
+    public $metadata;
+
+    /** @ManyToOne(targetEntity="DDC2759Category", inversedBy="metadataCategories") */
+    public $category;
+
+    public function __construct(DDC2759QualificationMetadata $metadata, DDC2759Category $category)
+    {
+        $this->metadata = $metadata;
+        $this->category = $category;
+    }
+}

tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php

@@ -34,4 +34,28 @@ class SimpleObjectHydratorTest extends HydrationTestCase
         $hydrator   = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
         $hydrator->hydrateAll($stmt, $rsm);
     }
+
+    public function testExtraFieldInResultSetShouldBeIgnore()
+    {
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a');
+        $rsm->addFieldResult('a', 'a__id', 'id');
+        $rsm->addFieldResult('a', 'a__city', 'city');
+        $resultSet = array(
+            array(
+                'a__id'   => '1',
+                'a__city' => 'Cracow',
+                'doctrine_rownum' => '1'
+            ),
+        );
+
+        $expectedEntity = new \Doctrine\Tests\Models\CMS\CmsAddress();
+        $expectedEntity->id = 1;
+        $expectedEntity->city = 'Cracow';
+
+        $stmt       = new HydratorMockStatement($resultSet);
+        $hydrator   = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em);
+        $result = $hydrator->hydrateAll($stmt, $rsm);
+        $this->assertEquals($result[0], $expectedEntity);
+    }
 }

tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

@@ -156,6 +156,8 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
     {
         $this->assertTrue($class->isVersioned);
         $this->assertEquals("version", $class->versionField);
+
+        $this->assertFalse(isset($class->fieldMappings['version']['version']));
     }
 
     /**
@@ -475,24 +477,22 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * @group DDC-889
-     * @expectedException Doctrine\ORM\Mapping\MappingException
-     * @expectedExceptionMessage Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.
      */
     public function testInvalidEntityOrMappedSuperClassShouldMentionParentClasses()
     {
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.');
+
         $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class');
     }
 
     /**
      * @group DDC-889
-     * @expectedException Doctrine\ORM\Mapping\MappingException
-     * @expectedExceptionMessage No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.
      */
     public function testIdentifierRequiredShouldMentionParentClasses()
     {
-
         $factory = $this->createClassMetadataFactory();
-        
+
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', 'No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.');
         $factory->getMetadataFor('Doctrine\Tests\Models\DDC889\DDC889Entity');
     }
 
@@ -509,7 +509,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testNamedNativeQuery()
     {
-        
+
         $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
 
         //named native query
@@ -538,7 +538,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertArrayHasKey('mapping-count', $class->sqlResultSetMappings);
         $this->assertArrayHasKey('mapping-find-all', $class->sqlResultSetMappings);
         $this->assertArrayHasKey('mapping-without-fields', $class->sqlResultSetMappings);
-        
+
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         $this->assertEquals('mapping-find-all', $findAllMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']);
@@ -550,7 +550,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
         $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']);
         $this->assertEquals(array(), $withoutFieldsMapping['entities'][0]['fields']);
-        
+
         $countMapping = $class->getSqlResultSetMapping('mapping-count');
         $this->assertEquals('mapping-count', $countMapping['name']);
         $this->assertEquals(array('name'=>'count'), $countMapping['columns'][0]);
@@ -638,7 +638,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $adminMetadata  = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Admin');
         $guestMetadata  = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Guest');
 
-        
+
         // assert groups association mappings
         $this->assertArrayHasKey('groups', $guestMetadata->associationMappings);
         $this->assertArrayHasKey('groups', $adminMetadata->associationMappings);
@@ -697,7 +697,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals($guestAddress['isCascadeRefresh'], $adminAddress['isCascadeRefresh']);
         $this->assertEquals($guestAddress['isCascadeMerge'], $adminAddress['isCascadeMerge']);
         $this->assertEquals($guestAddress['isCascadeDetach'], $adminAddress['isCascadeDetach']);
-        
+
         // assert override
         $this->assertEquals('address_id', $guestAddress['joinColumns'][0]['name']);
         $this->assertEquals(array('address_id'=>'id'), $guestAddress['sourceToTargetKeyColumns']);
@@ -1071,7 +1071,7 @@ class DDC807Entity
      * @GeneratedValue(strategy="NONE")
      **/
    public $id;
-   
+
    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
          $metadata->mapField(array(

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php

@@ -977,6 +977,31 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
 
         $cm->setAttributeOverride('name', array('type'=>'date'));
     }
+
+    /**
+     * @group DDC-2608
+     */
+    public function testSetSequenceGeneratorThrowsExceptionWhenSequenceNameIsMissing()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
+        $cm->setSequenceGeneratorDefinition(array());
+    }
+
+    /**
+     * @group DDC-2662
+     */
+    public function testQuotedSequenceName()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $cm->setSequenceGeneratorDefinition(array('sequenceName' => '`foo`'));
+
+        $this->assertEquals(array('sequenceName' => 'foo', 'quoted' => true), $cm->sequenceGeneratorDefinition);
+    }
 }
 
 class MyNamespacedNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy

tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.dcm.yml

@@ -5,4 +5,4 @@ Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType:
       generator:
         strategy: NONE
   fields:
-    name:
+    name: ~

tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.DDC2069Entity.dcm.yml

@@ -1,7 +1,7 @@
 Doctrine\Tests\ORM\Mapping\DDC2069Entity:
   type: entity
   id:
-    id:
+    id: ~
   fields:
     name:
       type: string ( 255 )
@@ -12,4 +12,4 @@ Doctrine\Tests\ORM\Mapping\DDC2069Entity:
       columns: name, value
   indexes:
     0:
-      columns: value, name
+      columns: value, name

tests/Doctrine/Tests/ORM/PersistentCollectionTest.php

@@ -6,16 +6,21 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\Tests\Mocks\ConnectionMock;
 use Doctrine\Tests\Mocks\EntityManagerMock;
-use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
-
-require_once __DIR__ . '/../TestInit.php';
+use Doctrine\Tests\Models\ECommerce\ECommerceCart;
+use Doctrine\Tests\OrmTestCase;
 
 /**
- * Tests the lazy-loading capabilities of the PersistentCollection.
+ * Tests the lazy-loading capabilities of the PersistentCollection and the initialization of collections.
  * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
+ * @author Austin Morris <austin.morris@gmail.com>
  */
-class PersistentCollectionTest extends \Doctrine\Tests\OrmTestCase
+class PersistentCollectionTest extends OrmTestCase
 {
+    /**
+     * @var PersistentCollection
+     */
+    protected $collection;
+
     private $_connectionMock;
     private $_emMock;
 
@@ -27,6 +32,17 @@ class PersistentCollectionTest extends \Doctrine\Tests\OrmTestCase
         $this->_emMock = EntityManagerMock::create($this->_connectionMock);
     }
 
+    /**
+     * Set up the PersistentCollection used for collection initialization tests.
+     */
+    public function setUpPersistentCollection()
+    {
+        $classMetaData = $this->_emMock->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCart');
+        $this->collection = new PersistentCollection($this->_emMock, $classMetaData, new ArrayCollection);
+        $this->collection->setInitialized(false);
+        $this->collection->setOwner(new ECommerceCart(), $classMetaData->getAssociationMapping('products'));
+    }
+
     public function testCanBePutInLazyLoadingMode()
     {
         $class = $this->_emMock->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct');
@@ -34,4 +50,34 @@ class PersistentCollectionTest extends \Doctrine\Tests\OrmTestCase
         $collection->setInitialized(false);
         $this->assertFalse($collection->isInitialized());
     }
+
+    /**
+     * Test that PersistentCollection::current() initializes the collection.
+     */
+    public function testCurrentInitializesCollection()
+    {
+        $this->setUpPersistentCollection();
+        $this->collection->current();
+        $this->assertTrue($this->collection->isInitialized());
+    }
+
+    /**
+     * Test that PersistentCollection::key() initializes the collection.
+     */
+    public function testKeyInitializesCollection()
+    {
+        $this->setUpPersistentCollection();
+        $this->collection->key();
+        $this->assertTrue($this->collection->isInitialized());
+    }
+
+    /**
+     * Test that PersistentCollection::next() initializes the collection.
+     */
+    public function testNextInitializesCollection()
+    {
+        $this->setUpPersistentCollection();
+        $this->collection->next();
+        $this->assertTrue($this->collection->isInitialized());
+    }
 }

tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php

@@ -96,6 +96,18 @@ class BasicEntityPersisterTypeValueSqlTest extends \Doctrine\Tests\OrmTestCase
     public function testSelectConditionStatementIsNull()
     {
         $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::IS);
-        $this->assertEquals('test IS ?', $statement);
+        $this->assertEquals('test IS NULL', $statement);
+    }
+
+    public function testSelectConditionStatementEqNull()
+    {
+        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::EQ);
+        $this->assertEquals('test IS NULL', $statement);
+    }
+
+    public function testSelectConditionStatementNeqNull()
+    {
+        $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::NEQ);
+        $this->assertEquals('test IS NOT NULL', $statement);
     }
 }

tests/Doctrine/Tests/ORM/Query/ExprTest.php

@@ -409,4 +409,18 @@ class ExprTest extends \Doctrine\Tests\OrmTestCase
         $select = new Expr\Select(array('foo', 'bar'));
         $this->assertEquals(array('foo', 'bar'), $select->getParts());
     }
+
+    public function testAddEmpty() {
+        $andExpr = $this->_expr->andx();
+        $andExpr->add($this->_expr->andx());
+        
+        $this->assertEquals(0, $andExpr->count());
+    }
+
+    public function testAddNull() {
+        $andExpr = $this->_expr->andx();
+        $andExpr->add(null);
+        
+        $this->assertEquals(0, $andExpr->count());
+    }
 }

tests/Doctrine/Tests/ORM/Query/QueryTest.php

@@ -105,6 +105,8 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('bar', $q->getHint('foo'));
         $this->assertEquals('baz', $q->getHint('bar'));
         $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
+        $this->assertTrue($q->hasHint('foo'));
+        $this->assertFalse($q->hasHint('barFooBaz'));
     }
 
     /**
@@ -163,4 +165,16 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('cities', $parameter->getName());
         $this->assertEquals($cities, $parameter->getValue());
     }
+
+    /**
+     * @group DDC-2224
+     */
+    public function testProcessParameterValueClassMetadata()
+    {
+        $query  = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
+        $this->assertEquals(
+            'Doctrine\Tests\Models\CMS\CmsAddress',
+            $query->processParameterValue($this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'))
+        );
+    }
 }

tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php

@@ -474,7 +474,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
     {
         $this->assertSqlGeneration(
             "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1",
-            "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')",
+            "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN (?)",
             array(), array(1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'))
         );
     }
@@ -1710,6 +1710,18 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             'SELECT q0_."group-id" AS groupid0, q0_."group-name" AS groupname1, q1_."group-id" AS groupid2, q1_."group-name" AS groupname3 FROM "quote-group" q0_ INNER JOIN "quote-group" q1_ ON q0_."parent-id" = q1_."group-id"'
         );
     }
+
+    /**
+     * @group DDC-2506
+     */
+    public function testClassTableInheritanceJoinWithConditionAppliesToBaseTable()
+    {
+        $this->assertSqlGeneration(
+            'SELECT e.id FROM Doctrine\Tests\Models\Company\CompanyOrganization o JOIN o.events e WITH e.id = ?1',
+            'SELECT c0_.id AS id0 FROM company_organizations c1_ INNER JOIN company_events c0_ ON c1_.id = c0_.org_id AND (c0_.id = ?) LEFT JOIN company_auctions c2_ ON c0_.id = c2_.id LEFT JOIN company_raffles c3_ ON c0_.id = c3_.id',
+            array(Query::HINT_FORCE_PARTIAL_LOAD => false)
+        );
+    }
 }
 
 class MyAbsFunction extends \Doctrine\ORM\Query\AST\Functions\FunctionNode

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

@@ -137,6 +137,19 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
             'SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles a ON u.id = a.author_id'
         );
     }
+    
+    public function testComplexInnerJoinWithIndexBy()
+    {
+        $qb = $this->_em->createQueryBuilder()
+            ->select('u', 'a')
+            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
+            ->innerJoin('u.articles', 'a', 'ON', 'u.id = a.author_id', 'a.name');
+
+        $this->assertValidQueryBuilder(
+            $qb,
+            'SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles a INDEX BY a.name ON u.id = a.author_id'
+        );
+    }    
 
     public function testLeftJoin()
     {

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

@@ -64,6 +64,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $metadata->mapManyToMany(array(
             'fieldName' => 'comments',
             'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorComment',
+            'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY,
             'joinTable' => array(
                 'name' => 'book_comment',
                 'joinColumns' => array(array('name' => 'book_id', 'referencedColumnName' => 'id')),
@@ -223,6 +224,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals($cm->identifier, $metadata->identifier);
         $this->assertEquals($cm->idGenerator, $metadata->idGenerator);
         $this->assertEquals($cm->customRepositoryClassName, $metadata->customRepositoryClassName);
+
+        $this->assertEquals(ClassMetadataInfo::FETCH_EXTRA_LAZY, $cm->associationMappings['comments']['fetch']);
     }
 
     public function testLoadPrefixedMetadata()
@@ -513,9 +516,9 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
             )),
             array(array(
                 'fieldName' => 'decimal',
-                'phpType' => 'float',
+                'phpType' => 'string',
                 'dbType' => 'decimal',
-                'value' => 33.33
+                'value' => '12.34'
             ),
         ));
     }

tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php

@@ -41,5 +41,22 @@ class CountOutputWalkerTest extends PaginationTestCase
             "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id1 FROM (SELECT count(u0_.id) AS sclr0, g1_.id AS id1, u0_.id AS id2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr0 > 0) dctrn_result) dctrn_table", $query->getSql()
         );
     }
+
+    public function testCountQueryOrderBySqlServer()
+    {
+        if ($this->entityManager->getConnection()->getDatabasePlatform()->getName() !== "mssql") {
+            $this->markTestSkipped('SQLServer only test.');
+        }
+
+        $query = $this->entityManager->createQuery(
+            'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p ORDER BY p.id');
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker');
+        $query->setFirstResult(null)->setMaxResults(null);
+
+        $this->assertEquals(
+            "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id0 FROM (SELECT b0_.id AS id0, b0_.author_id AS author_id1, b0_.category_id AS category_id2 FROM BlogPost b0_) dctrn_result) dctrn_table",
+            $query->getSql()
+        );
+    }
 }
 

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

@@ -227,6 +227,15 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
         // This commit should not raise an E_NOTICE
         $this->_unitOfWork->commit();
     }
+
+    /**
+     * @group DDC-1984
+     */
+    public function testLockWithoutEntityThrowsException()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $this->_unitOfWork->lock(null, null, null);
+    }
 }
 
 /**

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -124,6 +124,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\CustomType\CustomTypeParent',
             'Doctrine\Tests\Models\CustomType\CustomTypeUpperCase',
         ),
+        'taxi' => array(
+            'Doctrine\Tests\Models\Taxi\PaidRide',
+            'Doctrine\Tests\Models\Taxi\Ride',
+            'Doctrine\Tests\Models\Taxi\Car',
+            'Doctrine\Tests\Models\Taxi\Driver',
+        ),
     );
 
     protected function useModelSet($setName)
@@ -239,6 +245,14 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $conn->executeUpdate('DELETE FROM customtype_uppercases');
         }
 
+
+        if (isset($this->_usedModelSets['taxi'])) {
+            $conn->executeUpdate('DELETE FROM taxi_paid_ride');
+            $conn->executeUpdate('DELETE FROM taxi_ride');
+            $conn->executeUpdate('DELETE FROM taxi_car');
+            $conn->executeUpdate('DELETE FROM taxi_driver');
+        }
+
         $this->_em->clear();
     }