Merge master into ImproveErrorMessages

doctrine-mapping.xsd

@@ -150,7 +150,7 @@
     <xs:restriction base="xs:token"> 
       <xs:enumeration value="CASCADE"/> 
       <xs:enumeration value="RESTRICT"/> 
-      <xs:enumeration value="SET_NULL"/>
+      <xs:enumeration value="SET NULL"/>
     </xs:restriction> 
   </xs:simpleType>
   

lib/Doctrine/ORM/EntityManager.php

@@ -128,7 +128,7 @@ class EntityManager implements ObjectManager
         $this->metadataFactory = new $metadataFactoryClassName;
         $this->metadataFactory->setEntityManager($this);
         $this->metadataFactory->setCacheDriver($this->config->getMetadataCacheImpl());
-        
+
         $this->unitOfWork = new UnitOfWork($this);
         $this->proxyFactory = new ProxyFactory($this,
                 $config->getProxyDir(),
@@ -203,18 +203,18 @@ class EntityManager implements ObjectManager
     public function transactional(Closure $func)
     {
         $this->conn->beginTransaction();
-        
+
         try {
             $return = $func($this);
-            
+
             $this->flush();
             $this->conn->commit();
-            
+
             return $return ?: true;
         } catch (Exception $e) {
             $this->close();
             $this->conn->rollback();
-            
+
             throw $e;
         }
     }
@@ -244,7 +244,7 @@ class EntityManager implements ObjectManager
      *
      * The class name must be the fully-qualified class name without a leading backslash
      * (as it is returned by get_class($obj)) or an aliased class name.
-     * 
+     *
      * Examples:
      * MyProject\Domain\User
      * sales:PriceRequest
@@ -422,16 +422,11 @@ class EntityManager implements ObjectManager
      * Clears the EntityManager. All entities that are currently managed
      * by this EntityManager become detached.
      *
-     * @param string $entityName
+     * @param string $entityName if given, only entities of this type will get detached
      */
     public function clear($entityName = null)
     {
-        if ($entityName === null) {
+        $this->unitOfWork->clear($entityName);
-            $this->unitOfWork->clear();
-        } else {
-            //TODO
-            throw new ORMException("EntityManager#clear(\$entityName) not yet implemented.");
-        }
     }
 
     /**
@@ -450,7 +445,7 @@ class EntityManager implements ObjectManager
      *
      * The entity will be entered into the database at or before transaction
      * commit or as a result of the flush operation.
-     * 
+     *
      * NOTE: The persist operation always considers entities that are not yet known to
      * this EntityManager as NEW. Do not pass detached entities to the persist operation.
      *
@@ -633,7 +628,7 @@ class EntityManager implements ObjectManager
 
     /**
      * Check if the Entity manager is open or closed.
-     * 
+     *
      * @return bool
      */
     public function isOpen()
@@ -714,6 +709,18 @@ class EntityManager implements ObjectManager
         return $this->proxyFactory;
     }
 
+    /**
+     * Helper method to initialize a lazy loading proxy or persistent collection.
+     *
+     * This method is a no-op for other objects
+     *
+     * @param object $obj
+     */
+    public function initializeObject($obj)
+    {
+        $this->unitOfWork->initializeObject($obj);
+    }
+
     /**
      * Factory method to create EntityManager instances.
      *

lib/Doctrine/ORM/EntityRepository.php

@@ -178,7 +178,7 @@ class EntityRepository implements ObjectRepository
      */
     public function findOneBy(array $criteria)
     {
-        return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria);
+        return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria, null, null, array(), 0, 1);
     }
 
     /**
@@ -204,8 +204,7 @@ class EntityRepository implements ObjectRepository
             );
         }
 
-        if ( !isset($arguments[0])) {
+        if (empty($arguments)) {
-            // we dont even want to allow null at this point, because we cannot (yet) transform it into IS NULL.
             throw ORMException::findByRequiresParameter($method.$by);
         }
 

lib/Doctrine/ORM/Event/OnClearEventArgs.php

@@ -36,12 +36,18 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
      */
     private $em;
 
+    /**
+     * @var string
+     */
+    private $entityClass;
+
     /**
      * @param \Doctrine\ORM\EntityManager $em
      */
-    public function __construct($em)
+    public function __construct($em, $entityClass = null)
     {
         $this->em = $em;
+        $this->entityClass = $entityClass;
     }
 
     /**
@@ -51,4 +57,24 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
     {
         return $this->em;
     }
+
+    /**
+     * Name of the entity class that is cleared, or empty if all are cleared.
+     *
+     * @return string
+     */
+    public function getEntityClass()
+    {
+        return $this->entityClass;
+    }
+
+    /**
+     * Check if event clears all entities.
+     *
+     * @return bool
+     */
+    public function clearsAllEntities()
+    {
+        return $this->entityClass === null;
+    }
 }

lib/Doctrine/ORM/Id/AssignedGenerator.php

@@ -53,14 +53,14 @@ class AssignedGenerator extends AbstractIdGenerator
                         if (!$em->getUnitOfWork()->isInIdentityMap($value)) {
                             throw ORMException::entityMissingForeignAssignedId($entity, $value);
                         }
-                        
+
                         // NOTE: Single Columns as associated identifiers only allowed - this constraint it is enforced.
                         $identifier[$idField] = current($em->getUnitOfWork()->getEntityIdentifier($value));
                     } else {
                         $identifier[$idField] = $value;
                     }
                 } else {
-                    throw ORMException::entityMissingAssignedId($entity);
+                    throw ORMException::entityMissingAssignedIdForField($entity, $idField);
                 }
             }
         } else {
@@ -71,17 +71,17 @@ class AssignedGenerator extends AbstractIdGenerator
                     if (!$em->getUnitOfWork()->isInIdentityMap($value)) {
                         throw ORMException::entityMissingForeignAssignedId($entity, $value);
                     }
-                    
+
                     // NOTE: Single Columns as associated identifiers only allowed - this constraint it is enforced.
                     $identifier[$idField] = current($em->getUnitOfWork()->getEntityIdentifier($value));
                 } else {
                     $identifier[$idField] = $value;
                 }
             } else {
-                throw ORMException::entityMissingAssignedId($entity);
+                throw ORMException::entityMissingAssignedIdForField($entity, $idField);
             }
         }
-        
+
         return $identifier;
     }
-}
+}

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

@@ -164,6 +164,11 @@ abstract class AbstractHydrator
      * field names during this procedure as well as any necessary conversions on
      * the values applied.
      *
+     * @param array $data SQL Result Row
+     * @param array &$cache Cache for column to field result information
+     * @param array &$id Dql-Alias => ID-Hash
+     * @param array &$nonemptyComponents Does this DQL-Alias has at least one non NULL value?
+     *
      * @return array  An array with all the fields (name => value) of the data row,
      *                grouped by their component alias.
      */

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

@@ -92,6 +92,11 @@ class ArrayHydrator extends AbstractHydrator
                 $parent = $this->_rsm->parentAliasMap[$dqlAlias];
                 $path = $parent . '.' . $dqlAlias;
 
+                // missing parent data, skipping as RIGHT JOIN hydration is not supported.
+                if ( ! isset($nonemptyComponents[$parent]) ) {
+                    continue;
+                }
+
                 // Get a reference to the right element in the result tree.
                 // This element will get the associated element attached.
                 if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) {
@@ -154,6 +159,17 @@ class ArrayHydrator extends AbstractHydrator
                 // It's a root result element
                 
                 $this->_rootAliases[$dqlAlias] = true; // Mark as root
+
+                // 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(0 => null);
+                    } else {
+                        $result[] = null;
+                    }
+                    ++$this->_resultCounter;
+                    continue;
+                }
                 
                 // Check for an existing element
                 if ($this->_isSimpleQuery || ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) {

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

@@ -302,6 +302,12 @@ class ObjectHydrator extends AbstractHydrator
                 // seen for this parent-child relationship
                 $path = $parentAlias . '.' . $dqlAlias;
 
+                // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
+                if (!isset($nonemptyComponents[$parentAlias])) {
+                    // TODO: Add special case code where we hydrate the right join objects into identity map at least
+                    continue;
+                }
+
                 // Get a reference to the parent object to which the joined element belongs.
                 if ($this->_rsm->isMixed && isset($this->_rootAliases[$parentAlias])) {
                     $first = reset($this->_resultPointers);
@@ -408,6 +414,18 @@ class ObjectHydrator extends AbstractHydrator
                 // PATH C: Its a root result element
                 $this->_rootAliases[$dqlAlias] = true; // Mark as root alias
 
+                // 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(0 => null);
+                    } else {
+                        $result[] = null;
+                    }
+                    ++$this->_resultCounter;
+                    continue;
+                }
+
+                // check for existing result from the iterations before
                 if ( ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) {
                     $element = $this->_getEntity($rowData[$dqlAlias], $dqlAlias);
                     if (isset($this->_rsm->indexByMap[$dqlAlias])) {

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -308,6 +308,10 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
             if ($parent && $parent->isInheritanceTypeSingleTable()) {
                 $class->setPrimaryTable($parent->table);
             }
+            
+            if ($parent && $parent->containsForeignIdentifier) {
+                $class->containsForeignIdentifier = true;
+            }
 
             $class->setParentClasses($visited);
 
@@ -490,6 +494,10 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     public function isTransient($class)
     {
+        if ( ! $this->initialized) {
+            $this->initialize();
+        }
+        
         return $this->driver->isTransient($class);
     }
 }

lib/Doctrine/ORM/ORMException.php

@@ -34,7 +34,7 @@ class ORMException extends Exception
         return new self("It's a requirement to specify a Metadata Driver and pass it ".
             "to Doctrine\ORM\Configuration::setMetadataDriverImpl().");
     }
-    
+
     public static function entityMissingForeignAssignedId($entity, $relatedEntity)
     {
         return new self(
@@ -46,15 +46,14 @@ class ORMException extends Exception
         );
     }
 
-    public static function entityMissingAssignedId($entity)
+    public static function entityMissingAssignedIdForField($entity, $field)
     {
-        return new self("Entity of type " . get_class($entity) . " is missing an assigned ID. " .
+        return new self("Entity of type " . get_class($entity) . " is missing an assigned ID for field  '" . $field . "'. " .
             "The identifier generation strategy for this entity requires the ID field to be populated before ".
-            "EntityManager#persist() is called. If you want automatically generated identifiers instead " . 
+            "EntityManager#persist() is called. If you want automatically generated identifiers instead " .
             "you need to adjust the metadata mapping accordingly."
         );
     }
-
     public static function unrecognizedField($field)
     {
         return new self("Unrecognized field: $field");
@@ -130,8 +129,8 @@ class ORMException extends Exception
             "Unknown Entity namespace alias '$entityNamespaceAlias'."
         );
     }
-    
+
-    public static function invalidEntityRepository($className) 
+    public static function invalidEntityRepository($className)
     {
         return new self("Invalid repository class '".$className."'. ".
                 "it must be a Doctrine\ORM\EntityRepository.");

lib/Doctrine/ORM/Persisters/BasicEntityPersister.php

@@ -580,12 +580,13 @@ class BasicEntityPersister
      * @param $assoc The association that connects the entity to load to another entity, if any.
      * @param array $hints Hints for entity creation.
      * @param int $lockMode
+     * @param int $limit Limit number of results
      * @return object The loaded and managed entity instance or NULL if the entity can not be found.
      * @todo Check identity map? loadById method? Try to guess whether $criteria is the id?
      */
-    public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0)
+    public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0, $limit = null)
     {
-        $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode);
+        $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode, $limit);
         list($params, $types) = $this->expandParameters($criteria);
         $stmt = $this->_conn->executeQuery($sql, $params, $types);
         
@@ -823,7 +824,7 @@ class BasicEntityPersister
                     
                     if (isset($sourceClass->associationMappings[$field])) {
                         $value = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
-                        $value = $value[$this->_em->getClassMetadata($assoc['targetEntity'])->identifier[0]];
+                        $value = $value[$this->_em->getClassMetadata($sourceClass->associationMappings[$field]['targetEntity'])->identifier[0]];
                     }
 
                     $criteria[$quotedJoinTable . "." . $relationKeyColumn] = $value;
@@ -847,7 +848,7 @@ class BasicEntityPersister
                     
                     if (isset($sourceClass->associationMappings[$field])) {
                         $value = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
-                        $value = $value[$this->_em->getClassMetadata($assoc['targetEntity'])->identifier[0]];
+                        $value = $value[$this->_em->getClassMetadata($sourceClass->associationMappings[$field]['targetEntity'])->identifier[0]];
                     }
                     
                     $criteria[$quotedJoinTable . "." . $relationKeyColumn] = $value;
@@ -1355,7 +1356,7 @@ class BasicEntityPersister
                 
                 if (isset($sourceClass->associationMappings[$field])) {
                     $value = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
-                    $value = $value[$this->_em->getClassMetadata($assoc['targetEntity'])->identifier[0]];
+                    $value = $value[$this->_em->getClassMetadata($sourceClass->associationMappings[$field]['targetEntity'])->identifier[0]];
                 }
                 
                 $criteria[$tableAlias . "." . $targetKeyColumn] = $value;

lib/Doctrine/ORM/Proxy/ProxyFactory.php

@@ -209,6 +209,11 @@ class ProxyFactory
 
                 $methods .= $parameterString . ')';
                 $methods .= "\n" . '    {' . "\n";
+                if ($this->isShortIdentifierGetter($method, $class)) {
+                    $methods .= '        if ($this->__isInitialized__ === false) {' . "\n";
+                    $methods .= '            return $this->_identifier["' . lcfirst(substr($method->getName(), 3)) . '"];' . "\n";
+                    $methods .= '        }' . "\n";
+                }
                 $methods .= '        $this->__load();' . "\n";
                 $methods .= '        return parent::' . $method->getName() . '(' . $argumentString . ');';
                 $methods .= "\n" . '    }' . "\n";
@@ -218,6 +223,23 @@ class ProxyFactory
         return $methods;
     }
 
+    /**
+     * @param ReflectionMethod $method
+     * @param ClassMetadata $class
+     * @return bool
+     */
+    private function isShortIdentifierGetter($method, $class)
+    {
+        $identifier = lcfirst(substr($method->getName(), 3)); 
+        return (
+            $method->getNumberOfParameters() == 0 &&
+            substr($method->getName(), 0, 3) == "get" &&
+            in_array($identifier, $class->identifier, true) &&
+            $class->hasField($identifier) &&
+            (($method->getEndLine() - $method->getStartLine()) <= 4)
+        );
+    }
+
     /**
      * Generates the code for the __sleep method for a proxy class.
      *
@@ -288,7 +310,7 @@ class <proxyClassName> extends \<className> implements \Doctrine\ORM\Proxy\Proxy
             unset($this->_entityPersister, $this->_identifier);
         }
     }
-    
+
     <methods>
 
     public function __sleep()

lib/Doctrine/ORM/Query/Expr.php

@@ -40,10 +40,12 @@ class Expr
      *
      *     [php]
      *     // (u.type = ?1) AND (u.role = ?2)
-     *     $expr->andX('u.type = ?1', 'u.role = ?2'));
+     *     $expr->andX($expr->eq('u.type', ':1'), $expr->eq('u.role', ':2'));
      *
-     * @param mixed $x Optional clause. Defaults = null, but requires
+     * @param Doctrine\ORM\Query\Expr\Comparison | 
-     *                 at least one defined when converting to string.
+     *          Doctrine\ORM\Query\Expr\Func |
+     *          Doctrine\ORM\Query\Expr\Orx 
+    *               $x Optional clause. Defaults = null, but requires at least one defined when converting to string.
      * @return Expr\Andx
      */
     public function andX($x = null)

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

@@ -45,12 +45,14 @@ abstract class Base
     {
         $this->addMultiple($args);
     }
-    
+
     public function addMultiple($args = array())
     {
         foreach ((array) $args as $arg) {
             $this->add($arg);
         }
+
+        return $this;
     }
 
     public function add($arg)
@@ -67,6 +69,8 @@ abstract class Base
 
             $this->_parts[] = $arg;
         }
+
+        return $this;
     }
 
     public function count()
@@ -79,7 +83,7 @@ abstract class Base
         if ($this->count() == 1) {
             return (string) $this->_parts[0];
         }
-        
+
         return $this->_preSeparator . implode($this->_separator, $this->_parts) . $this->_postSeparator;
     }
-}
+}

lib/Doctrine/ORM/Query/Parser.php

@@ -1328,18 +1328,18 @@ class Parser
         // We need to check if we are in a IdentificationVariable or SingleValuedPathExpression
         $glimpse = $this->_lexer->glimpse();
 
-        if ($glimpse['type'] != Lexer::T_DOT) {
+        if ($glimpse['type'] == Lexer::T_DOT) {
-            $token = $this->_lexer->lookahead;
+            return $this->SingleValuedPathExpression();
-            $identVariable = $this->IdentificationVariable();
+        }
+        
+        $token = $this->_lexer->lookahead;
+        $identVariable = $this->IdentificationVariable();
 
-            if (!isset($this->_queryComponents[$identVariable])) {
+        if (!isset($this->_queryComponents[$identVariable])) {
-                $this->semanticalError('Cannot group by undefined identification variable.');
+            $this->semanticalError('Cannot group by undefined identification variable.');
-            }
-
-            return $identVariable;
         }
 
-        return $this->SingleValuedPathExpression();
+        return $identVariable;
     }
 
     /**
@@ -1354,12 +1354,9 @@ class Parser
         // We need to check if we are in a ResultVariable or StateFieldPathExpression
         $glimpse = $this->_lexer->glimpse();
 
-        if ($glimpse['type'] != Lexer::T_DOT) {
+        $expr = ($glimpse['type'] != Lexer::T_DOT) 
-            $token = $this->_lexer->lookahead;
+            ? $this->ResultVariable()
-            $expr = $this->ResultVariable();
+            : $this->SingleValuedPathExpression();
-        } else {
-            $expr = $this->SingleValuedPathExpression();
-        }
 
         $item = new AST\OrderByItem($expr);
 

lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -115,10 +115,12 @@ public function <methodName>()
  * <description>
  *
  * @param <variableType>$<variableName>
+ * @return <entity>
  */
 public function <methodName>(<methodTypeHint>$<variableName>)
 {
 <spaces>$this-><fieldName> = $<variableName>;
+<spaces>return $this;
 }';
 
     private static $_addMethodTemplate =
@@ -302,9 +304,6 @@ public function <methodName>()
      */
     public function setAnnotationPrefix($prefix)
     {
-        if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) {
-            return;
-        }
         $this->_annotationsPrefix = $prefix;
     }
 
@@ -737,7 +736,8 @@ public function <methodName>()
           '<variableType>'      => $variableType,
           '<variableName>'      => Inflector::camelize($fieldName),
           '<methodName>'        => $methodName,
-          '<fieldName>'         => $fieldName
+          '<fieldName>'         => $fieldName,
+          '<entity>'            => $this->_getClassName($metadata)
         );
 
         $method = str_replace(
@@ -791,7 +791,7 @@ public function <methodName>()
         }
 
         if (isset($joinColumn['onDelete'])) {
-            $joinColumnAnnot[] = 'onDelete=' . ($joinColumn['onDelete'] ? 'true' : 'false');
+            $joinColumnAnnot[] = 'onDelete="' . ($joinColumn['onDelete'] . '"');
         }
 
         if (isset($joinColumn['columnDefinition'])) {

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

@@ -139,6 +139,9 @@ class XmlExporter extends AbstractExporter
                 if (isset($field['columnName'])) {
                     $idXml->addAttribute('column', $field['columnName']);
                 }
+                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/SchemaValidator.php

@@ -152,6 +152,17 @@ class SchemaValidator
                                         "has to be a primary key column.";
                             }
                         }
+
+                        if (count($targetClass->identifier) != count($assoc['joinTable']['inverseJoinColumns'])) {
+                            $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
+                                    "have to match to ALL identifier columns of the target entity '". $targetClass->name . "'";
+                        }
+
+                        if (count($class->identifier) != count($assoc['joinTable']['joinColumns'])) {
+                            $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
+                                    "have to match to ALL identifier columns of the source entity '". $class->name . "'";
+                        }
+
                     } else if ($assoc['type'] & ClassMetadataInfo::TO_ONE) {
                         foreach ($assoc['joinColumns'] AS $joinColumn) {
                             $targetClass = $cmf->getMetadataFor($assoc['targetEntity']);
@@ -167,6 +178,11 @@ class SchemaValidator
                                         "has to be a primary key column.";
                             }
                         }
+
+                        if (count($class->identifier) != count($assoc['joinColumns'])) {
+                            $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " .
+                                    "have to match to ALL identifier columns of the source entity '". $class->name . "'";
+                        }
                     }
                 }
 

lib/Doctrine/ORM/UnitOfWork.php

@@ -398,6 +398,8 @@ class UnitOfWork implements PropertyChangedListener
      * If a PersistentCollection has been de-referenced in a fully MANAGED entity,
      * then this collection is marked for deletion.
      *
+     * @ignore
+     * @internal Don't call from the outside.
      * @param ClassMetadata $class The class descriptor of the entity.
      * @param object $entity The entity for which to compute the changes.
      */
@@ -488,8 +490,9 @@ class UnitOfWork implements PropertyChangedListener
                         }
                     } else if ($orgValue instanceof PersistentCollection && $orgValue !== $actualValue) {
                         // A PersistentCollection was de-referenced, so delete it.
-                        if  ( ! in_array($orgValue, $this->collectionDeletions, true)) {
+                        $coid = spl_object_hash($orgValue);
-                            $this->collectionDeletions[] = $orgValue;
+                        if ( ! isset($this->collectionDeletions[$coid]) ) {
+                            $this->collectionDeletions[$coid] = $orgValue;
                             $changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored.
                         }
                     }
@@ -567,10 +570,11 @@ class UnitOfWork implements PropertyChangedListener
     private function computeAssociationChanges($assoc, $value)
     {
         if ($value instanceof PersistentCollection && $value->isDirty()) {
+            $coid = spl_object_hash($value);
             if ($assoc['isOwningSide']) {
-                $this->collectionUpdates[] = $value;
+                $this->collectionUpdates[$coid] = $value;
             }
-            $this->visitedCollections[] = $value;
+            $this->visitedCollections[$coid] = $value;
         }
 
         // Look through the entities, and in any of their associations, for transient (new)
@@ -653,7 +657,7 @@ class UnitOfWork implements PropertyChangedListener
      * @param object $entity The entity for which to (re)calculate the change set.
      * @throws InvalidArgumentException If the passed entity is not MANAGED.
      */
-    public function recomputeSingleEntityChangeSet($class, $entity)
+    public function recomputeSingleEntityChangeSet(ClassMetadata $class, $entity)
     {
         $oid = spl_object_hash($entity);
         
@@ -871,6 +875,7 @@ class UnitOfWork implements PropertyChangedListener
                     $targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
                     if ( ! $calc->hasClass($targetClass->name)) {
                         $calc->addClass($targetClass);
+                        $newNodes[] = $targetClass;
                     }
                     $calc->addDependency($targetClass, $class);
                     // If the target class has mapped subclasses,
@@ -1470,11 +1475,17 @@ class UnitOfWork implements PropertyChangedListener
                             if ($this->getEntityState($other, self::STATE_DETACHED) == self::STATE_MANAGED) {
                                 $prop->setValue($managedCopy, $other);
                             } else {
+
                                 $targetClass = $this->em->getClassMetadata($assoc2['targetEntity']);
-                                $id = $targetClass->getIdentifierValues($other);
+                                $relatedId = $targetClass->getIdentifierValues($other);
-                                $proxy = $this->em->getProxyFactory()->getProxy($assoc2['targetEntity'], $id);
+
-                                $prop->setValue($managedCopy, $proxy);
+                                if ($targetClass->subClasses) {
-                                $this->registerManaged($proxy, $id, array());
+                                    $entity = $this->em->find($targetClass->name, $relatedId);
+                                } else {
+                                    $proxy = $this->em->getProxyFactory()->getProxy($assoc2['targetEntity'], $relatedId);
+                                    $prop->setValue($managedCopy, $proxy);
+                                    $this->registerManaged($proxy, $relatedId, array());
+                                }
                             }
                         }
                     } else {
@@ -1556,8 +1567,9 @@ class UnitOfWork implements PropertyChangedListener
      * 
      * @param object $entity
      * @param array $visited
+     * @param boolean $noCascade if true, don't cascade detach operation
      */
-    private function doDetach($entity, array &$visited)
+    private function doDetach($entity, array &$visited, $noCascade = false)
     {
         $oid = spl_object_hash($entity);
         if (isset($visited[$oid])) {
@@ -1579,8 +1591,10 @@ class UnitOfWork implements PropertyChangedListener
             case self::STATE_DETACHED:
                 return;
         }
-        
+
-        $this->cascadeDetach($entity, $visited);
+        if (!$noCascade) {
+            $this->cascadeDetach($entity, $visited);
+        }
     }
     
     /**
@@ -1831,28 +1845,41 @@ class UnitOfWork implements PropertyChangedListener
 
     /**
      * Clears the UnitOfWork.
+     *
+     * @param string $entityName if given, only entities of this type will get detached
      */
-    public function clear()
+    public function clear($entityName = null)
     {
-        $this->identityMap =
+        if ($entityName === null) {
-        $this->entityIdentifiers =
+            $this->identityMap =
-        $this->originalEntityData =
+            $this->entityIdentifiers =
-        $this->entityChangeSets =
+            $this->originalEntityData =
-        $this->entityStates =
+            $this->entityChangeSets =
-        $this->scheduledForDirtyCheck =
+            $this->entityStates =
-        $this->entityInsertions =
+            $this->scheduledForDirtyCheck =
-        $this->entityUpdates =
+            $this->entityInsertions =
-        $this->entityDeletions =
+            $this->entityUpdates =
-        $this->collectionDeletions =
+            $this->entityDeletions =
-        $this->collectionUpdates =
+            $this->collectionDeletions =
-        $this->extraUpdates =
+            $this->collectionUpdates =
-        $this->orphanRemovals = array();
+            $this->extraUpdates =
-        if ($this->commitOrderCalculator !== null) {
+            $this->orphanRemovals = array();
-            $this->commitOrderCalculator->clear();
+            if ($this->commitOrderCalculator !== null) {
+                $this->commitOrderCalculator->clear();
+            }
+        } else {
+            $visited = array();
+            foreach ($this->identityMap as $className => $entities) {
+                if ($className === $entityName) {
+                    foreach ($entities as $entity) {
+                        $this->doDetach($entity, $visited, true);
+                    }
+                }
+            }
         }
 
         if ($this->evm->hasListeners(Events::onClear)) {
-            $this->evm->dispatchEvent(Events::onClear, new Event\OnClearEventArgs($this->em));
+            $this->evm->dispatchEvent(Events::onClear, new Event\OnClearEventArgs($this->em, $entityName));
         }
     }
     
@@ -1880,12 +1907,12 @@ class UnitOfWork implements PropertyChangedListener
     {
         //TODO: if $coll is already scheduled for recreation ... what to do?
         // Just remove $coll from the scheduled recreations?
-        $this->collectionDeletions[] = $coll;
+        $this->collectionDeletions[spl_object_hash($coll)] = $coll;
     }
 
     public function isCollectionScheduledForDeletion(PersistentCollection $coll)
     {
-        return in_array($coll, $this->collectionsDeletions, true);
+        return isset( $this->collectionsDeletions[spl_object_hash($coll)] );
     }
 
     /**

lib/vendor/doctrine-common

@@ -1 +1 @@
-Subproject commit ef431a14852d7e8f2d0ea789487509ab266e5ce2
+Subproject commit b2fd909b4b5476df01744c9d34c7a23723a687b6

tests/Doctrine/Tests/Models/CMS/CmsUser.php

@@ -19,7 +19,7 @@ class CmsUser
      */
     public $id;
     /**
-     * @Column(type="string", length=50)
+     * @Column(type="string", length=50, nullable=true)
      */
     public $status;
     /**
@@ -35,7 +35,7 @@ class CmsUser
      */
     public $phonenumbers;
     /**
-     * @OneToMany(targetEntity="CmsArticle", mappedBy="user")
+     * @OneToMany(targetEntity="CmsArticle", mappedBy="user", cascade={"detach"})
      */
     public $articles;
     /**
@@ -48,7 +48,7 @@ class CmsUser
      */
     public $email;
     /**
-     * @ManyToMany(targetEntity="CmsGroup", inversedBy="users", cascade={"persist", "merge"})
+     * @ManyToMany(targetEntity="CmsGroup", inversedBy="users", cascade={"persist", "merge", "detach"})
      * @JoinTable(name="cms_users_groups",
      *      joinColumns={@JoinColumn(name="user_id", referencedColumnName="id")},
      *      inverseJoinColumns={@JoinColumn(name="group_id", referencedColumnName="id")}

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

@@ -980,4 +980,54 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertTrue($article->user->__isInitialized__, "...but its initialized!");
         $this->assertEquals($qc+2, $this->getCurrentQueryCount());
     }
+
+    /**
+     * @group DDC-1278
+     */
+    public function testClearWithEntityName()
+    {
+        $user = new CmsUser;
+        $user->name = 'Dominik';
+        $user->username = 'domnikl';
+        $user->status = 'developer';
+
+        $address = new CmsAddress();
+        $address->city = "Springfield";
+        $address->zip = "12354";
+        $address->country = "Germany";
+        $address->street = "Foo Street";
+        $address->user = $user;
+        $user->address = $address;
+
+        $article1 = new CmsArticle();
+        $article1->topic = 'Foo';
+        $article1->text = 'Foo Text';
+
+        $article2 = new CmsArticle();
+        $article2->topic = 'Bar';
+        $article2->text = 'Bar Text';
+
+        $user->addArticle($article1);
+        $user->addArticle($article2);
+
+        $this->_em->persist($article1);
+        $this->_em->persist($article2);
+        $this->_em->persist($address);
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $unitOfWork = $this->_em->getUnitOfWork();
+
+        $this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser');
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user));
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address));
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($article1));
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($article2));
+
+        $this->_em->clear();
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address));
+    }
 }

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

@@ -38,18 +38,25 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $user2->status = 'dev';
         $this->_em->persist($user2);
 
+        $user3 = new CmsUser;
+        $user3->name = 'Benjamin';
+        $user3->username = 'beberlei';
+        $user3->status = null;
+        $this->_em->persist($user3);
+
         $this->_em->flush();
-        
+
         $user1Id = $user->getId();
-        
+
         unset($user);
         unset($user2);
-        
+        unset($user3);
+
         $this->_em->clear();
 
         return $user1Id;
     }
-    
+
     public function loadAssociatedFixture()
     {
         $address = new CmsAddress();
@@ -189,7 +196,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
         $users = $repos->findAll();
-        $this->assertEquals(2, count($users));
+        $this->assertEquals(3, count($users));
     }
 
     public function testFindByAlias()
@@ -202,7 +209,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $repos = $this->_em->getRepository('CMS:CmsUser');
 
         $users = $repos->findAll();
-        $this->assertEquals(2, count($users));
+        $this->assertEquals(3, count($users));
     }
 
     /**
@@ -284,10 +291,11 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testFindMagicCallByNullValue()
     {
         $this->loadFixture();
+
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
-        $this->setExpectedException('Doctrine\ORM\ORMException');
         $users = $repos->findByStatus(null);
+        $this->assertEquals(1, count($users));
     }
 
     /**
@@ -389,7 +397,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
     /**
      * @group DDC-1087
      */
-    public function testIsNullCriteria()
+    public function testIsNullCriteriaDoesNotGenerateAParameter()
     {
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
         $users = $repos->findBy(array('status' => null, 'username' => 'romanb'));
@@ -399,6 +407,16 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(array('romanb'), $params);
     }
 
+    public function testIsNullCriteria()
+    {
+        $this->loadFixture();
+
+        $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
+
+        $users = $repos->findBy(array('status' => null));
+        $this->assertEquals(1, count($users));
+    }
+
     /**
      * @group DDC-1094
      */
@@ -411,7 +429,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $users1 = $repos->findBy(array(), null, 1, 0);
         $users2 = $repos->findBy(array(), null, 1, 1);
 
-        $this->assertEquals(2, count($repos->findBy(array())));
+        $this->assertEquals(3, count($repos->findBy(array())));
         $this->assertEquals(1, count($users1));
         $this->assertEquals(1, count($users2));
         $this->assertNotSame($users1[0], $users2[0]);
@@ -428,10 +446,10 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $usersAsc = $repos->findBy(array(), array("username" => "ASC"));
         $usersDesc = $repos->findBy(array(), array("username" => "DESC"));
 
-        $this->assertEquals(2, count($usersAsc), "Pre-condition: only two users in fixture");
+        $this->assertEquals(3, count($usersAsc), "Pre-condition: only three users in fixture");
-        $this->assertEquals(2, count($usersDesc), "Pre-condition: only two users in fixture");
+        $this->assertEquals(3, count($usersDesc), "Pre-condition: only three users in fixture");
-        $this->assertSame($usersAsc[0], $usersDesc[1]);
+        $this->assertSame($usersAsc[0], $usersDesc[2]);
-        $this->assertSame($usersAsc[1], $usersDesc[0]);
+        $this->assertSame($usersAsc[2], $usersDesc[0]);
     }
     
     

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

@@ -78,7 +78,7 @@ class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $reference = $this->_em->getReference('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity', $id);
         $this->assertFalse($reference->postLoadCallbackInvoked);
 
-        $reference->getId(); // trigger proxy load
+        $reference->getValue(); // trigger proxy load
         $this->assertTrue($reference->postLoadCallbackInvoked);
     }
 
@@ -210,6 +210,10 @@ class LifecycleCallbackTestEntity
         return $this->id;
     }
     
+    public function getValue() {
+        return $this->value;
+    }
+    
     /** @PrePersist */
     public function doStuffOnPrePersist() {
         $this->prePersistCallbackInvoked = true;
@@ -274,4 +278,4 @@ class LifecycleListenerPreUpdate
     {
         $eventArgs->setNewValue('name', 'Bob');
     }
-}
+}

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

@@ -104,7 +104,7 @@ class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
         
-        $cache = $this->getMock('Doctrine\Common\Cache\ArrayCache', array('doFetch', 'doSave'));
+        $cache = $this->getMock('Doctrine\Common\Cache\ArrayCache', array('doFetch', 'doSave', 'doGetStats'));
         $cache->expects($this->at(0))
               ->method('doFetch')
               ->with($this->isType('string'))
@@ -135,7 +135,7 @@ class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
                          ->will($this->returnValue($sqlExecMock));
 
         $cache = $this->getMock('Doctrine\Common\Cache\CacheProvider', 
-                array('doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush'));
+                array('doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush', 'doGetStats'));
         $cache->expects($this->once())
               ->method('doFetch')
               ->with($this->isType('string'))

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

@@ -147,4 +147,28 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertTrue($entity->wakeUp, "Loading the proxy should call __wakeup().");
     }
+
+    public function testDoNotInitializeProxyOnGettingTheIdentifier()
+    {
+        $id = $this->createProduct();
+
+        /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */
+        $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id);
+
+        $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
+        $this->assertEquals($id, $entity->getId());
+        $this->assertFalse($entity->__isInitialized__, "Getting the identifier doesn't initialize the proxy.");
+    }
+
+    public function testInitializeProxyOnGettingSomethingOtherThanTheIdentifier()
+    {
+        $id = $this->createProduct();
+
+        /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */
+        $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id);
+
+        $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
+        $this->assertEquals('Doctrine Cookbook', $entity->getName());
+        $this->assertTrue($entity->__isInitialized__, "Getting something other than the identifier initializes the proxy.");
+    }
 }

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

@@ -52,6 +52,8 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
         
+        // force proxy load, getId() doesn't work anymore
+        $user->getName();
         $userId = $user->getId();
         $this->_em->clear();
         
@@ -60,6 +62,8 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase
         
         $user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId);
         
+        // force proxy load, getId() doesn't work anymore
+        $user->getName();
         $this->assertNull($user->getId(), "Now this is null, we already have a user instance of that type");
     }
 }

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

@@ -0,0 +1,99 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+use Doctrine\ORM\UnitOfWork;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1383
+ */
+class DDC1383Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+		
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383AbstractEntity'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383Entity'),
+            ));
+        } catch(\Exception $ignored) {}
+    }
+
+    public function testFailingCase()
+    {
+		$parent = new DDC1383Entity();
+		$child = new DDC1383Entity();
+		
+		$child->setReference($parent);
+		
+		$this->_em->persist($parent);
+		$this->_em->persist($child);
+		
+		$id = $child->getId();
+		
+		$this->_em->flush();
+		$this->_em->clear();
+		
+		// Try merging the parent entity
+		$child = $this->_em->merge($child);
+		$parent = $child->getReference();
+		
+		// Parent is not instance of the abstract class
+		self::assertTrue($parent instanceof DDC1383AbstractEntity,
+				"Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected');
+		
+		// Parent is NOT instance of entity
+		self::assertTrue($parent instanceof DDC1383Entity,
+				"Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected');
+    }
+}
+
+/**
+ * @Entity
+ * @InheritanceType("JOINED")
+ * @DiscriminatorColumn(name="discr", type="integer")
+ * @DiscriminatorMap({1 = "DDC1383Entity"})
+ */
+abstract class DDC1383AbstractEntity
+{
+	/**
+	 * @Id
+	 * @Column(type="integer")
+	 * @GeneratedValue
+	 */
+	protected $id;
+	
+	public function getId()
+	{
+		return $this->id;
+	}
+
+	public function setId($id)
+	{
+		$this->id = $id;
+	}
+}
+
+/**
+ * @Entity
+ */
+class DDC1383Entity extends DDC1383AbstractEntity
+{
+	/**
+	 * @ManyToOne(targetEntity="DDC1383AbstractEntity")
+	 */
+	protected $reference;
+	
+	public function getReference()
+	{
+		return $this->reference;
+	}
+
+	public function setReference(DDC1383AbstractEntity $reference)
+	{
+		$this->reference = $reference;
+	}
+}

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

@@ -31,8 +31,8 @@ class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $entity = $this->_em->getReference('Doctrine\Tests\ORM\Functional\Ticket\DDC381Entity', $persistedId);
 
-        // explicitly load proxy
+        // explicitly load proxy (getId() does not trigger reload of proxy)
-        $id = $entity->getId();
+        $id = $entity->getOtherMethod();
 
         $data = serialize($entity);
         $entity = unserialize($data);
@@ -55,4 +55,9 @@ class DDC381Entity
     {
         return $this->id;
     }
+    
+    public function getOtherMethod()
+    {
+        
+    }
 }

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

@@ -763,4 +763,58 @@ class ArrayHydratorTest extends HydrationTestCase
 
         $this->assertEquals(1, count($result));
     }
+
+    /**
+     * @group DDC-1358
+     */
+    public function testMissingIdForRootEntity()
+    {
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+        $rsm->addFieldResult('u', 'u__id', 'id');
+        $rsm->addFieldResult('u', 'u__status', 'status');
+        $rsm->addScalarResult('sclr0', 'nameUpper');
+
+        // Faked result set
+        $resultSet = array(
+            //row1
+            array(
+                'u__id' => '1',
+                'u__status' => 'developer',
+                'sclr0' => 'ROMANB',
+                ),
+            array(
+                'u__id' => null,
+                'u__status' => null,
+                'sclr0' => 'ROMANB',
+                ),
+            array(
+                'u__id' => '2',
+                'u__status' => 'developer',
+                'sclr0' => 'JWAGE',
+                ),
+            array(
+                'u__id' => null,
+                'u__status' => null,
+                'sclr0' => 'JWAGE',
+                ),
+            );
+
+        $stmt = new HydratorMockStatement($resultSet);
+        $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em);
+
+        $result = $hydrator->hydrateAll($stmt, $rsm);
+
+        $this->assertEquals(4, count($result), "Should hydrate four results.");
+
+        $this->assertEquals('ROMANB', $result[0]['nameUpper']);
+        $this->assertEquals('ROMANB', $result[1]['nameUpper']);
+        $this->assertEquals('JWAGE', $result[2]['nameUpper']);
+        $this->assertEquals('JWAGE', $result[3]['nameUpper']);
+
+        $this->assertEquals(array('id' => 1, 'status' => 'developer'), $result[0][0]);
+        $this->assertNull($result[1][0]);
+        $this->assertEquals(array('id' => 2, 'status' => 'developer'), $result[2][0]);
+        $this->assertNull($result[3][0]);
+    }
 }

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

@@ -1008,4 +1008,165 @@ class ObjectHydratorTest extends HydrationTestCase
         $this->assertEquals(4, count($result[1]->groups));
         $this->assertEquals(2, count($result[1]->phonenumbers));
     }
+
+    /**
+     * @group DDC-1358
+     */
+    public function testMissingIdForRootEntity()
+    {
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+        $rsm->addFieldResult('u', 'u__id', 'id');
+        $rsm->addFieldResult('u', 'u__status', 'status');
+        $rsm->addScalarResult('sclr0', 'nameUpper');
+
+        // Faked result set
+        $resultSet = array(
+            //row1
+            array(
+                'u__id' => '1',
+                'u__status' => 'developer',
+                'sclr0' => 'ROMANB',
+                ),
+            array(
+                'u__id' => null,
+                'u__status' => null,
+                'sclr0' => 'ROMANB',
+                ),
+            array(
+                'u__id' => '2',
+                'u__status' => 'developer',
+                'sclr0' => 'JWAGE',
+                ),
+            array(
+                'u__id' => null,
+                'u__status' => null,
+                'sclr0' => 'JWAGE',
+                ),
+            );
+
+        $stmt = new HydratorMockStatement($resultSet);
+        $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
+
+        $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+
+        $this->assertEquals(4, count($result), "Should hydrate four results.");
+
+        $this->assertEquals('ROMANB', $result[0]['nameUpper']);
+        $this->assertEquals('ROMANB', $result[1]['nameUpper']);
+        $this->assertEquals('JWAGE', $result[2]['nameUpper']);
+        $this->assertEquals('JWAGE', $result[3]['nameUpper']);
+
+        $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]);
+        $this->assertNull($result[1][0]);
+        $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][0]);
+        $this->assertNull($result[3][0]);
+    }
+
+    /**
+     * @group DDC-1358
+     * @return void
+     */
+    public function testMissingIdForCollectionValuedChildEntity()
+    {
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+        $rsm->addJoinedEntityResult(
+                'Doctrine\Tests\Models\CMS\CmsPhonenumber',
+                'p',
+                'u',
+                'phonenumbers'
+        );
+        $rsm->addFieldResult('u', 'u__id', 'id');
+        $rsm->addFieldResult('u', 'u__status', 'status');
+        $rsm->addScalarResult('sclr0', 'nameUpper');
+        $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber');
+
+        // Faked result set
+        $resultSet = array(
+            //row1
+            array(
+                'u__id' => '1',
+                'u__status' => 'developer',
+                'sclr0' => 'ROMANB',
+                'p__phonenumber' => '42',
+                ),
+            array(
+                'u__id' => '1',
+                'u__status' => 'developer',
+                'sclr0' => 'ROMANB',
+                'p__phonenumber' => null
+                ),
+            array(
+                'u__id' => '2',
+                'u__status' => 'developer',
+                'sclr0' => 'JWAGE',
+                'p__phonenumber' => '91'
+                ),
+            array(
+                'u__id' => '2',
+                'u__status' => 'developer',
+                'sclr0' => 'JWAGE',
+                'p__phonenumber' => null
+                )
+            );
+
+        $stmt = new HydratorMockStatement($resultSet);
+        $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
+
+        $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+
+        $this->assertEquals(2, count($result));
+        $this->assertEquals(1, $result[0][0]->phonenumbers->count());
+        $this->assertEquals(1, $result[1][0]->phonenumbers->count());
+    }
+
+    /**
+     * @group DDC-1358
+     */
+    public function testMissingIdForSingleValuedChildEntity()
+    {
+        $rsm = new ResultSetMapping;
+        $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+        $rsm->addJoinedEntityResult(
+                'Doctrine\Tests\Models\CMS\CmsAddress',
+                'a',
+                'u',
+                'address'
+        );
+        $rsm->addFieldResult('u', 'u__id', 'id');
+        $rsm->addFieldResult('u', 'u__status', 'status');
+        $rsm->addScalarResult('sclr0', 'nameUpper');
+        $rsm->addFieldResult('a', 'a__id', 'id');
+        $rsm->addFieldResult('a', 'a__city', 'city');
+        $rsm->addMetaResult('a', 'user_id', 'user_id');
+
+        // Faked result set
+        $resultSet = array(
+            //row1
+            array(
+                'u__id' => '1',
+                'u__status' => 'developer',
+                'sclr0' => 'ROMANB',
+                'a__id' => 1,
+                'a__city' => 'Berlin',
+                ),
+            array(
+                'u__id' => '2',
+                'u__status' => 'developer',
+                'sclr0' => 'BENJAMIN',
+                'a__id' => null,
+                'a__city' => null,
+                ),
+            );
+
+        $stmt = new HydratorMockStatement($resultSet);
+        $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em);
+
+        $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true));
+
+        $this->assertEquals(2, count($result));
+        $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $result[0][0]->address);
+        $this->assertNull($result[1][0]->address);
+    }
 }

tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php

@@ -73,12 +73,13 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $persister = $this->_getMockPersister();
         $this->_uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister);
         $proxy = $this->_proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $identifier);
+
         $persister->expects($this->atLeastOnce())
                   ->method('load')
                   ->with($this->equalTo($identifier), $this->isInstanceOf($proxyClass))
                   ->will($this->returnValue(new \stdClass())); // fake return of entity instance
-        $proxy->getId();
         $proxy->getDescription();
+        $proxy->getProduct();
     }
 
     public function testReferenceProxyRespectsMethodsParametersTypeHinting()
@@ -179,4 +180,4 @@ class SleepClass
     {
         return array('id');
     }
-}
+}

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

@@ -1239,6 +1239,18 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
             array(Query::HINT_FORCE_PARTIAL_LOAD => true)
         );
     }
+    
+    /**
+     * @group DDC-1161
+     */
+    public function testSelfReferenceWithOneToOneDoesNotDuplicateAlias()
+    {
+        $this->assertSqlGeneration(
+            'SELECT p, pp FROM Doctrine\Tests\Models\Company\CompanyPerson p JOIN p.spouse pp', 
+            "SELECT c0_.id AS id0, c0_.name AS name1, c1_.title AS title2, c1_.car_id AS car_id3, c2_.salary AS salary4, c2_.department AS department5, c2_.startDate AS startDate6, c3_.id AS id7, c3_.name AS name8, c4_.title AS title9, c4_.car_id AS car_id10, c5_.salary AS salary11, c5_.department AS department12, c5_.startDate AS startDate13, c0_.discr AS discr14, c0_.spouse_id AS spouse_id15, c3_.discr AS discr16, c3_.spouse_id AS spouse_id17 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ ON c0_.spouse_id = c3_.id LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id",
+            array(Query::HINT_FORCE_PARTIAL_LOAD => false)
+        );
+    }
 }
 
 

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

@@ -21,6 +21,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
         $this->_tmpDir = \sys_get_temp_dir();
         \mkdir($this->_tmpDir . \DIRECTORY_SEPARATOR . $this->_namespace);
         $this->_generator = new EntityGenerator();
+        $this->_generator->setAnnotationPrefix("");
         $this->_generator->setGenerateAnnotations(true);
         $this->_generator->setGenerateStubMethods(true);
         $this->_generator->setRegenerateEntityIfExists(false);
@@ -179,14 +180,15 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
 
     public function testLoadPrefixedMetadata()
     {
-        $this->_generator->setAnnotationPrefix('orm:');
+        $this->_generator->setAnnotationPrefix('ORM\\');
         $metadata = $this->generateBookEntityFixture();
 
+        $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+        $driver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, array());
 
         $book = $this->newInstance($metadata);
 
         $cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name);
-        $driver = $this->createAnnotationDriver(array(), 'orm');
         $driver->loadMetadataForClass($cm->name, $cm);
 
         $this->assertEquals($cm->columnNames, $metadata->columnNames);

tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php

@@ -115,6 +115,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
         $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
         if ($type === 'annotation') {
             $entityGenerator = new EntityGenerator();
+            $entityGenerator->setAnnotationPrefix("");
             $exporter->setEntityGenerator($entityGenerator);
         }
         $this->_extension = $exporter->getExtension();
@@ -141,6 +142,8 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
         $cmf = $this->_createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
 
+        $this->assertEquals(1, count($metadata));
+
         $class = current($metadata);
     
         $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\ExportedUser', $class->name);
@@ -322,6 +325,11 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
         $this->assertEquals('user', $class->associationMappings['address']['inversedBy']);
     }
 
+    public function __destruct()
+    {
+#        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
+    }
+
     protected function _deleteDirectory($path)
     {
         if (is_file($path)) {
@@ -347,4 +355,4 @@ class Phonenumber
 class Group
 {
     
-}
+}

tests/Doctrine/Tests/OrmTestCase.php

@@ -11,6 +11,7 @@ abstract class OrmTestCase extends DoctrineTestCase
 {
     /** The metadata cache that is shared between all ORM tests (except functional tests). */
     private static $_metadataCacheImpl = null;
+    
     /** The query cache that is shared between all ORM tests (except functional tests). */
     private static $_queryCacheImpl = null;
 
@@ -66,30 +67,31 @@ abstract class OrmTestCase extends DoctrineTestCase
      */
     protected function _getTestEntityManager($conn = null, $conf = null, $eventManager = null, $withSharedMetadata = true)
     {
+        $metadataCache = $withSharedMetadata 
+            ? self::getSharedMetadataCacheImpl() 
+            : new \Doctrine\Common\Cache\ArrayCache;
+        
         $config = new \Doctrine\ORM\Configuration();
-        if($withSharedMetadata) {
+        
-            $config->setMetadataCacheImpl(self::getSharedMetadataCacheImpl());
+        $config->setMetadataCacheImpl($metadataCache);
-        } else {
-            $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache);
-        }
-
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver());
-
         $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
         $config->setProxyDir(__DIR__ . '/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
-        $eventManager = new \Doctrine\Common\EventManager();
+        
         if ($conn === null) {
             $conn = array(
-                'driverClass' => 'Doctrine\Tests\Mocks\DriverMock',
+                'driverClass'  => 'Doctrine\Tests\Mocks\DriverMock',
                 'wrapperClass' => 'Doctrine\Tests\Mocks\ConnectionMock',
-                'user' => 'john',
+                'user'         => 'john',
-                'password' => 'wayne'
+                'password'     => 'wayne'
             );
         }
+        
         if (is_array($conn)) {
             $conn = \Doctrine\DBAL\DriverManager::getConnection($conn, $config, $eventManager);
         }
+        
         return \Doctrine\Tests\Mocks\EntityManagerMock::create($conn, $config, $eventManager);
     }
 
@@ -98,6 +100,7 @@ abstract class OrmTestCase extends DoctrineTestCase
         if (self::$_metadataCacheImpl === null) {
             self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
         }
+        
         return self::$_metadataCacheImpl;
     }
     
@@ -106,6 +109,7 @@ abstract class OrmTestCase extends DoctrineTestCase
         if (self::$_queryCacheImpl === null) {
             self::$_queryCacheImpl = new \Doctrine\Common\Cache\ArrayCache;
         }
+        
         return self::$_queryCacheImpl;
     }
 }