Release 2.1.0

This reverts commit 4603e94fe9.

Making an exception go away is not a fix for something. :)

UPGRADE_TO_2_1

@@ -9,6 +9,8 @@ The EntityRepository now has an interface Doctrine\Common\Persistence\ObjectRepo
 
 The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way:
 
+    \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('/doctrine-src/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
+
     $reader = new \Doctrine\Common\Annotations\AnnotationReader();
     $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
     // new code necessary starting here

lib/Doctrine/ORM/Configuration.php

@@ -20,8 +20,11 @@
 namespace Doctrine\ORM;
 
 use Doctrine\Common\Cache\Cache,
+    Doctrine\Common\Cache\ArrayCache,
+    Doctrine\Common\Annotations\AnnotationRegistry,
+    Doctrine\Common\Annotations\AnnotationReader,
     Doctrine\ORM\Mapping\Driver\Driver,
-    Doctrine\Common\Cache\ArrayCache;
+    Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 
 /**
  * Configuration container for all configuration options of Doctrine.
@@ -122,10 +125,16 @@ class Configuration extends \Doctrine\DBAL\Configuration
     public function newDefaultAnnotationDriver($paths = array())
     {
         if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) {
-            $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+            // Register the ORM Annotations in the AnnotationRegistry
+            AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
+            
+            $reader = new AnnotationReader();
             $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache());
-        } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) {
-            $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+        } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-DEV', '>=')) {
+            // Register the ORM Annotations in the AnnotationRegistry
+            AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
+            
+            $reader = new AnnotationReader();
             $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
             $reader->setIgnoreNotImportedAnnotations(true);
             $reader->setEnableParsePhpImports(false);
@@ -133,10 +142,10 @@ class Configuration extends \Doctrine\DBAL\Configuration
                 new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache()
             );
         } else {
-            $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+            $reader = new AnnotationReader();
             $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
         }
-        return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array)$paths);
+        return new AnnotationDriver($reader, (array)$paths);
     }
 
     /**

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -248,11 +248,13 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
 
         // Move down the hierarchy of parent classes, starting from the topmost class
         $parent = null;
+        $rootEntityFound = false;
         $visited = array();
         foreach ($parentClasses as $className) {
             if (isset($this->loadedMetadata[$className])) {
                 $parent = $this->loadedMetadata[$className];
                 if ( ! $parent->isMappedSuperclass) {
+                    $rootEntityFound = true;
                     array_unshift($visited, $className);
                 }
                 continue;
@@ -281,7 +283,10 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
                 throw MappingException::reflectionFailure($className, $e);
             }
 
-            if ($parent && ! $parent->isMappedSuperclass) {
+            // If this class has a parent the id generator strategy is inherited.
+            // However this is only true if the hierachy of parents contains the root entity,
+            // if it consinsts of mapped superclasses these don't necessarily include the id field.
+            if ($parent && $rootEntityFound) {
                 if ($parent->isIdGeneratorSequence()) {
                     $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition);
                 } else if ($parent->isIdGeneratorTable()) {
@@ -322,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
                     if (!$class->discriminatorColumn) {
                         throw MappingException::missingDiscriminatorColumn($class->name);
                     }
-                } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) {
+                } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) {
                     // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur.
                     throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName);
                 }
@@ -336,6 +341,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
             $parent = $class;
 
             if ( ! $class->isMappedSuperclass) {
+                $rootEntityFound = true;
                 array_unshift($visited, $className);
             }
 

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -832,7 +832,7 @@ class ClassMetadataInfo implements ClassMetadata
         }
 
         // Cascades
-        $cascades = isset($mapping['cascade']) ? $mapping['cascade'] : array();
+        $cascades = isset($mapping['cascade']) ? array_map('strtolower', $mapping['cascade']) : array();
         if (in_array('all', $cascades)) {
             $cascades = array(
                'remove',
@@ -1271,7 +1271,8 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public function getTemporaryIdTableName()
     {
-        return $this->table['name'] . '_id_tmp';
+        // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
+        return str_replace('.', '_', $this->table['name'] . '_id_tmp');
     }
 
     /**

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

@@ -21,11 +21,10 @@ namespace Doctrine\ORM\Mapping\Driver;
 
 use Doctrine\Common\Cache\ArrayCache,
     Doctrine\Common\Annotations\AnnotationReader,
+    Doctrine\Common\Annotations\AnnotationRegistry,
     Doctrine\ORM\Mapping\ClassMetadataInfo,
     Doctrine\ORM\Mapping\MappingException;
 
-require __DIR__ . '/DoctrineAnnotations.php';
-
 /**
  * The AnnotationDriver reads the mapping metadata from docblock annotations.
  *
@@ -42,7 +41,7 @@ class AnnotationDriver implements Driver
      *
      * @var AnnotationReader
      */
-    private $_reader;
+    protected $_reader;
 
     /**
      * The paths where to look for mapping files.

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

@@ -110,6 +110,8 @@ class DatabaseDriver implements Driver
             return;
         }
 
+        $tables = array();
+                
         foreach ($this->_sm->listTableNames() as $tableName) {
             $tables[$tableName] = $this->_sm->listTableDetails($tableName);
         }

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

@@ -23,24 +23,41 @@ use Doctrine\Common\Annotations\Annotation;
 
 /* Annotations */
 
+/** @Annotation */
 final class Entity extends Annotation {
     public $repositoryClass;
     public $readOnly = false;
 }
+
+/** @Annotation */
 final class MappedSuperclass extends Annotation {}
+
+/** @Annotation */
 final class InheritanceType extends Annotation {}
+
+/** @Annotation */
 final class DiscriminatorColumn extends Annotation {
     public $name;
     public $fieldName; // field name used in non-object hydration (array/scalar)
     public $type;
     public $length;
 }
+
+/** @Annotation */
 final class DiscriminatorMap extends Annotation {}
+
+/** @Annotation */
 final class Id extends Annotation {}
+
+/** @Annotation */
 final class GeneratedValue extends Annotation {
     public $strategy = 'AUTO';
 }
+
+/** @Annotation */
 final class Version extends Annotation {}
+
+/** @Annotation */
 final class JoinColumn extends Annotation {
     public $name;
     public $fieldName; // field name used in non-object hydration (array/scalar)
@@ -51,7 +68,11 @@ final class JoinColumn extends Annotation {
     public $onUpdate;
     public $columnDefinition;
 }
+
+/** @Annotation */
 final class JoinColumns extends Annotation {}
+
+/** @Annotation */
 final class Column extends Annotation {
     public $type = 'string';
     public $length;
@@ -65,6 +86,8 @@ final class Column extends Annotation {
     public $options = array();
     public $columnDefinition;
 }
+
+/** @Annotation */
 final class OneToOne extends Annotation {
     public $targetEntity;
     public $mappedBy;
@@ -73,6 +96,8 @@ final class OneToOne extends Annotation {
     public $fetch = 'LAZY';
     public $orphanRemoval = false;
 }
+
+/** @Annotation */
 final class OneToMany extends Annotation {
     public $mappedBy;
     public $targetEntity;
@@ -81,12 +106,16 @@ final class OneToMany extends Annotation {
     public $orphanRemoval = false;
     public $indexBy;
 }
+
+/** @Annotation */
 final class ManyToOne extends Annotation {
     public $targetEntity;
     public $cascade;
     public $fetch = 'LAZY';
     public $inversedBy;
 }
+
+/** @Annotation */
 final class ManyToMany extends Annotation {
     public $targetEntity;
     public $mappedBy;
@@ -95,50 +124,83 @@ final class ManyToMany extends Annotation {
     public $fetch = 'LAZY';
     public $indexBy;
 }
+
+/** @Annotation */
 final class ElementCollection extends Annotation {
     public $tableName;
 }
+
+/** @Annotation */
 final class Table extends Annotation {
     public $name;
     public $schema;
     public $indexes;
     public $uniqueConstraints;
 }
+
+/** @Annotation */
 final class UniqueConstraint extends Annotation {
     public $name;
     public $columns;
 }
+
+/** @Annotation */
 final class Index extends Annotation {
     public $name;
     public $columns;
 }
+
+/** @Annotation */
 final class JoinTable extends Annotation {
     public $name;
     public $schema;
     public $joinColumns = array();
     public $inverseJoinColumns = array();
 }
+
+/** @Annotation */
 final class SequenceGenerator extends Annotation {
     public $sequenceName;
     public $allocationSize = 1;
     public $initialValue = 1;
 }
+
+/** @Annotation */
 final class ChangeTrackingPolicy extends Annotation {}
+
+/** @Annotation */
 final class OrderBy extends Annotation {}
 
+/** @Annotation */
 final class NamedQueries extends Annotation {}
+
+/** @Annotation */
 final class NamedQuery extends Annotation {
     public $name;
     public $query;
 }
 
 /* Annotations for lifecycle callbacks */
+/** @Annotation */
 final class HasLifecycleCallbacks extends Annotation {}
-final class PrePersist extends Annotation {}
-final class PostPersist extends Annotation {}
-final class PreUpdate extends Annotation {}
-final class PostUpdate extends Annotation {}
-final class PreRemove extends Annotation {}
-final class PostRemove extends Annotation {}
-final class PostLoad extends Annotation {}
 
+/** @Annotation */
+final class PrePersist extends Annotation {}
+
+/** @Annotation */
+final class PostPersist extends Annotation {}
+
+/** @Annotation */
+final class PreUpdate extends Annotation {}
+
+/** @Annotation */
+final class PostUpdate extends Annotation {}
+
+/** @Annotation */
+final class PreRemove extends Annotation {}
+
+/** @Annotation */
+final class PostRemove extends Annotation {}
+
+/** @Annotation */
+final class PostLoad extends Annotation {}

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

@@ -435,7 +435,7 @@ class YamlDriver extends AbstractFileDriver
                 }
 
                 if (isset($manyToManyElement['orphanRemoval'])) {
-                    $mapping['orphanRemoval'] = (bool)$manyToManyElement['orphan-removal'];
+                    $mapping['orphanRemoval'] = (bool)$manyToManyElement['orphanRemoval'];
                 }
 
                 if (isset($manyToManyElement['orderBy'])) {

lib/Doctrine/ORM/Mapping/MappingException.php

@@ -289,7 +289,8 @@ class MappingException extends \Doctrine\ORM\ORMException
     {
         return new self(
             "Entity '" . $className . "' has to be part of the descriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract."
+            "to be properly mapped in the inheritance hierachy. Alternatively you can make '".$className."' an abstract class " .
+            "to avoid this exception from occuring."
         );
     }
 }

lib/Doctrine/ORM/PersistentCollection.php

@@ -572,6 +572,7 @@ final class PersistentCollection implements Collection
             }
         }
         $this->coll->clear();
+        $this->initialized = true; // direct call, {@link initialize()} is too expensive
         if ($this->association['isOwningSide']) {
             $this->changed();
             $this->em->getUnitOfWork()->scheduleCollectionDeletion($this);

lib/Doctrine/ORM/Persisters/BasicEntityPersister.php

@@ -953,12 +953,17 @@ class BasicEntityPersister
                     }
                 }
                 $this->_selectJoinSql .= ' LEFT JOIN'; // TODO: Inner join when all join columns are NOT nullable.
+                $first = true;
                 if ($assoc['isOwningSide']) {
                     $this->_selectJoinSql .= ' ' . $eagerEntity->table['name'] . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON ';
                     
                     foreach ($assoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) {
+                        if (!$first) {
+                            $this->_selectJoinSql .= ' AND ';
+                        }
                         $this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.'.$sourceCol.' = ' .
                                                  $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias) . '.'.$targetCol.' ';
+                        $first = false;
                     }
                 } else {
                     $eagerEntity = $this->_em->getClassMetadata($assoc['targetEntity']);
@@ -967,8 +972,12 @@ class BasicEntityPersister
                     $this->_selectJoinSql .= ' ' . $eagerEntity->table['name'] . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON ';
 
                     foreach ($owningAssoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) {
+                        if (!$first) {
+                            $this->_selectJoinSql .= ' AND ';
+                        }
                         $this->_selectJoinSql .= $this->_getSQLTableAlias($owningAssoc['sourceEntity'], $assocAlias) . '.'.$sourceCol.' = ' .
                                                  $this->_getSQLTableAlias($owningAssoc['targetEntity']) . '.' . $targetCol . ' ';
+                        $first = false;
                     }
                 }
             }

lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php

@@ -284,7 +284,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
             }
 
             $resultColumnName = $this->_platform->getSQLResultCasing($discrColumn);
-            $this->_rsm->setDiscriminatorColumn('r', $discrColumn);
+            $this->_rsm->setDiscriminatorColumn('r', $resultColumnName);
             $this->_rsm->addMetaResult('r', $resultColumnName, $discrColumn);
         }
 

lib/Doctrine/ORM/Persisters/SingleTablePersister.php

@@ -49,7 +49,7 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
         $rootClass = $this->_em->getClassMetadata($this->_class->rootEntityName);
         $tableAlias = $this->_getSQLTableAlias($rootClass->name);
         $resultColumnName = $this->_platform->getSQLResultCasing($discrColumn);
-        $this->_rsm->setDiscriminatorColumn('r', $discrColumn);
+        $this->_rsm->setDiscriminatorColumn('r', $resultColumnName);
         $this->_rsm->addMetaResult('r', $resultColumnName, $discrColumn);
 
         // Append subclass columns

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

@@ -55,7 +55,7 @@ abstract class Base
 
     public function add($arg)
     {
-        if ( ! empty($arg) || ($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/Composite.php

@@ -43,11 +43,26 @@ class Composite extends Base
         $components = array();
         
         foreach ($this->_parts as $part) {
-            $components[] = (is_object($part) && $part instanceof self && $part->count() > 1)
-                ? $this->_preSeparator . ((string) $part) . $this->_postSeparator
-                : ((string) $part);
+            $components[] = $this->processQueryPart($part);
         }
         
         return implode($this->_separator, $components);
     }
+    
+    
+    private function processQueryPart($part)
+    {
+        $queryPart = (string) $part;
+        
+        if (is_object($part) && $part instanceof self && $part->count() > 1) {
+            return $this->_preSeparator . $queryPart . $this->_postSeparator;
+        }
+        
+        // Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND")
+        if (mb_stripos($queryPart, ' OR ') !== false || mb_stripos($queryPart, ' AND ') !== false) {
+            return $this->_preSeparator . $queryPart . $this->_postSeparator;
+        }
+        
+        return $queryPart;
+    }
 }

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -558,7 +558,7 @@ class SqlWalker implements TreeWalker
 
                 $columnAlias = $this->_platform->getSQLResultCasing($columnAlias);
                 $this->_rsm->setDiscriminatorColumn($dqlAlias, $columnAlias);
-                $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $discrColumn['fieldName']);
+                $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName']);
 
                 // Add foreign key columns to SQL, if necessary
                 if ($addMetaColumns) {

lib/Doctrine/ORM/QueryBuilder.php

@@ -986,7 +986,7 @@ class QueryBuilder
             foreach ($fromParts as $from) {
                 $fromClause = (string) $from;
 
-                if (isset($joinParts[$from->getAlias()])) {
+                if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
                         $fromClause .= ' ' . ((string) $join);
                     }

lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php

@@ -128,8 +128,8 @@ EOT
             $output->writeln(sprintf('The Schema-Tool would execute <info>"%s"</info> queries to update the database.', count($sqls)));
             $output->writeln('Please run the operation by passing one of the following options:');
             
-            $output->writeln(sprintf('    <info>%s --force</info> to execute the command', $this->getFullName()));
-            $output->writeln(sprintf('    <info>%s --dump-sql</info> to dump the SQL statements to the screen', $this->getFullName()));
+            $output->writeln(sprintf('    <info>%s --force</info> to execute the command', $this->getName()));
+            $output->writeln(sprintf('    <info>%s --dump-sql</info> to dump the SQL statements to the screen', $this->getName()));
         }
     }
 }

lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -103,7 +103,7 @@ use Doctrine\ORM\Mapping as ORM;
 '/**
  * <description>
  *
- * @return <variableType>$<variableName>
+ * @return <variableType>
  */
 public function <methodName>()
 {

lib/Doctrine/ORM/UnitOfWork.php

@@ -577,7 +577,7 @@ class UnitOfWork implements PropertyChangedListener
                             . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
                             . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
                             . " Explicitly persist the new entity or configure cascading persist operations"
-                            . " on the relationship. If you cannot find out which entity casues the problem"
+                            . " on the relationship. If you cannot find out which entity causes the problem"
                             . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue.");
                 }
                 $this->persistNew($targetClass, $entry);
@@ -984,7 +984,7 @@ class UnitOfWork implements PropertyChangedListener
             if ($this->isInIdentityMap($entity)) {
                 $this->removeFromIdentityMap($entity);
             }
-            unset($this->entityInsertions[$oid]);
+            unset($this->entityInsertions[$oid], $this->entityStates[$oid]);
             return; // entity has not been persisted yet, so nothing more to do.
         }
 
@@ -999,6 +999,7 @@ class UnitOfWork implements PropertyChangedListener
         }
         if ( ! isset($this->entityDeletions[$oid])) {
             $this->entityDeletions[$oid] = $entity;
+            $this->entityStates[$oid] = self::STATE_REMOVED;
         }
     }
 
@@ -1884,13 +1885,16 @@ class UnitOfWork implements PropertyChangedListener
             if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                 $entity->__isInitialized__ = true;
                 $overrideLocalValues = true;
-                $this->originalEntityData[$oid] = $data;
                 if ($entity instanceof NotifyPropertyChanged) {
                     $entity->addPropertyChangedListener($this);
                 }
             } else {
                 $overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
             }
+
+            if ($overrideLocalValues) {
+                $this->originalEntityData[$oid] = $data;
+            }
         } else {
             $entity = $class->newInstance();
             $oid = spl_object_hash($entity);

lib/Doctrine/ORM/Version.php

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

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

@@ -140,6 +140,40 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($user2->address instanceof \Doctrine\ORM\Proxy\Proxy);
     }
     
+    /**
+     * @group DDC-1230
+     */
+    public function testRemove()
+    {
+        $user = new CmsUser;
+        $user->name = 'Guilherme';
+        $user->username = 'gblanco';
+        $user->status = 'developer';
+
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user));
+        
+        $this->_em->persist($user);
+        
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user));
+        
+        $this->_em->remove($user);
+        
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user));
+        
+        $this->_em->persist($user);
+        $this->_em->flush();
+        $id = $user->getId();
+        
+        $this->_em->remove($user);
+        
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user));
+        $this->_em->flush();
+        
+        $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user));
+        
+        $this->assertNull($this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $id));
+    }
+    
     public function testOneToManyOrphanRemoval()
     {
         $user = new CmsUser;
@@ -827,36 +861,6 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(0, $this->_em->getConnection()->fetchColumn("select count(*) from cms_addresses where id=".$addressId.""));
     }
 
-    public function testClearingCollectionDoesNotInitialize()
-    {
-        $user = new CmsUser();
-        $user->username = "beberlei";
-        $user->name = "Benjamin E.";
-        $user->status = 'active';
-
-        $grp = new CmsGroup();
-        $grp->setName("The Dudes");
-
-        $grp->addUser($user);
-        $user->addGroup($grp);
-
-        $this->_em->persist($user);
-        $this->_em->persist($grp);
-        $this->_em->flush();
-        $this->_em->clear();
-
-        $this->assertEquals(1, $this->_em->getConnection()->fetchColumn("select count(*) from cms_users_groups"));
-
-        $user2 = $this->_em->find(get_class($user), $user->id);
-        $this->assertFalse($user2->groups->isInitialized());
-        $user2->groups->clear();
-        $this->assertFalse($user2->groups->isInitialized());
-        $this->_em->flush();
-        $this->assertFalse($user2->groups->isInitialized());
-        
-        $this->assertEquals(0, $this->_em->getConnection()->fetchColumn("select count(*) from cms_users_groups"));
-    }
-
     public function testGetPartialReferenceToUpdateObjectWithoutLoadingIt()
     {
         //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);

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

@@ -357,4 +357,24 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa
         $this->_em->getUnitOfWork()->initializeObject($user->groups);
         $this->assertTrue($user->groups->isInitialized(), "Collection should be initialized after calling UnitOfWork::initializeObject()");
     }
+    
+    /**
+     * @group DDC-1189
+     * @group DDC-956
+     */
+    public function testClearBeforeLazyLoad()
+    {
+        $user = $this->addCmsUserGblancoWithGroups(4);
+        
+        $this->_em->clear();
+        
+        $user = $this->_em->find(get_class($user), $user->id);
+        $user->groups->clear(); 
+        $this->assertEquals(0, count($user->groups));
+        
+        $this->_em->flush();
+        
+        $user = $this->_em->find(get_class($user), $user->id);
+        $this->assertEquals(0, count($user->groups));
+    }
 }

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

@@ -274,10 +274,15 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     public function testDateDiff()
     {
-        $arg = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), '2011-01-01') AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m")
-                ->getARrayResult();
-
-        $this->assertTrue($arg[0]['diff'] > 0);
+        $query = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day')) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
+        $arg = $query->getArrayResult();
+        
+        $this->assertEquals(-10, $arg[0]['diff'], "Should be roughly -10 (or -9)", 1);
+        
+        $query = $this->_em->createQuery("SELECT DATE_DIFF(DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day'), CURRENT_TIMESTAMP()) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m");
+        $arg = $query->getArrayResult();
+        
+        $this->assertEquals(10, $arg[0]['diff'], "Should be roughly 10 (or 9)", 1);
     }
 
     /**

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

@@ -0,0 +1,136 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Tests\Models\CMS\CmsEmployee;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1228
+ * @group DDC-1226
+ */
+class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'),
+            ));
+        } catch(\PDOException $e) {
+            
+        }
+    }
+    
+    public function testOneToOnePersist()
+    {
+        $user = new DDC1228User;
+        $profile = new DDC1228Profile();
+        $profile->name = "Foo";
+        $user->profile = $profile;
+        
+        $this->_em->persist($user);
+        $this->_em->persist($profile);
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        
+        $this->assertFalse($user->getProfile()->__isInitialized__, "Proxy is not initialized");
+        $user->getProfile()->setName("Bar");
+        $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized");
+        
+        $this->assertEquals("Bar", $user->getProfile()->getName());
+        $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile()));
+        
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        $this->assertEquals("Bar", $user->getProfile()->getName());
+    }
+    
+    public function testRefresh()
+    {
+        $user = new DDC1228User;
+        $profile = new DDC1228Profile();
+        $profile->name = "Foo";
+        $user->profile = $profile;
+        
+        $this->_em->persist($user);
+        $this->_em->persist($profile);
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        
+        $this->_em->refresh($user);
+        $user->name = "Baz";
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        $this->assertEquals("Baz", $user->name);
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1228User
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     * @var int
+     */
+    public $id;
+    
+    /**
+     * @column(type="string")
+     * @var string
+     */
+    public $name = '';
+    
+    /**
+     * @OneToOne(targetEntity="DDC1228Profile")
+     * @var Profile
+     */
+    public $profile;
+    
+    public function getProfile()   
+    {
+        return $this->profile;
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1228Profile
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     * @var int
+     */
+    public $id;
+    
+    /**
+     * @column(type="string")
+     * @var string
+     */
+    public $name;
+    
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+}

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

@@ -8,7 +8,7 @@ use Doctrine\Tests\Models\Generic\DecimalModel;
 use Doctrine\Tests\Models\Generic\SerializationModel;
 
 use Doctrine\ORM\Mapping\AssociationMapping;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Type as DBALType;
 
 require_once __DIR__ . '/../../TestInit.php';
 
@@ -135,7 +135,7 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->clear();
 
         $dateTimeDb = $this->_em->createQuery('SELECT d FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.datetime = ?1')
-                                ->setParameter(1, $date, Type::DATETIME)
+                                ->setParameter(1, $date, DBALType::DATETIME)
                                 ->getSingleResult();
     }
 
@@ -154,7 +154,7 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
                                  ->select('d')
                                  ->from('Doctrine\Tests\Models\Generic\DateTimeModel', 'd')
                                  ->where('d.datetime = ?1')
-                                 ->setParameter(1, $date, Type::DATETIME)
+                                 ->setParameter(1, $date, DBALType::DATETIME)
                                  ->getQuery()->getSingleResult();
     }
 

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

@@ -85,7 +85,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testUnmappedEntityInHierachy()
     {
-        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract.");
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' an abstract class to avoid this exception from occuring.");
         
         $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE');
     }
@@ -100,6 +100,45 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
         
         $this->assertTrue(isset($class->fieldMappings['id']));
     }
+    
+    /**
+     * @group DDC-1156
+     * @group DDC-1218
+     */
+    public function testGeneratedValueFromMappedSuperclass()
+    {
+        $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity');
+        /* @var $class ClassMetadataInfo */
+        
+        $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
+        $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition);
+    }
+    
+    /**
+     * @group DDC-1156
+     * @group DDC-1218
+     */
+    public function testSequenceDefinitionInHierachyWithSandwichMappedSuperclass()
+    {
+        $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyD');
+        /* @var $class ClassMetadataInfo */
+        
+        $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
+        $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition);
+    }
+    
+    /**
+     * @group DDC-1156
+     * @group DDC-1218
+     */
+    public function testMultipleMappedSuperclasses()
+    {
+        $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\MediumSuperclassEntity');
+        /* @var $class ClassMetadataInfo */
+        
+        $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator);
+        $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition);
+    }
 }
 
 class TransientBaseClass {
@@ -151,7 +190,8 @@ class EntitySubClass2 extends MappedSuperclassBase {
 abstract class HierachyBase
 {
     /**
-     * @Column(type="integer") @Id @GeneratedValue
+     * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE")
+     * @SequenceGenerator(sequenceName="foo", initialValue="10")
      * @var int
      */
     public $id;
@@ -169,7 +209,7 @@ abstract class HierachyASuperclass extends HierachyBase
 /**
  * @Entity
  */
-abstract class HierachyBEntity extends HierachyBase
+class HierachyBEntity extends HierachyBase
 {
     /** @Column(type="string") */
     public $b;
@@ -216,8 +256,25 @@ class SuperclassEntity extends SuperclassBase
 abstract class SuperclassBase
 {
     /**
-     * @Column(type="integer") @Id @GeneratedValue
+     * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") 
+     * @SequenceGenerator(sequenceName="foo", initialValue="10")
      * @var int
      */
     public $id;
+}
+
+/**
+ * @MappedSuperclass
+ */
+abstract class MediumSuperclassBase extends SuperclassBase
+{
+    
+}
+
+/**
+ * @Entity
+ */
+class MediumSuperclassEntity extends MediumSuperclassBase
+{
+    
 }

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

@@ -236,6 +236,17 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
         $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
     }
+    
+    /**
+     * @group DDC-1224
+     */
+    public function testGetTemporaryTableNameSchema()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->setTableName('foo.bar');
+        
+        $this->assertEquals('foo_bar_id_tmp', $cm->getTemporaryIdTableName());
+    }
 
     public function testDefaultTableName()
     {

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

@@ -197,6 +197,17 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid');
     }
+    
+    public function testComplexAndWhere()
+    {
+        $qb = $this->_em->createQueryBuilder()
+            ->select('u')
+            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
+            ->where('u.id = :uid OR u.id = :uid2 OR u.id = :uid3')
+            ->andWhere('u.name = :name');
+            
+        $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid OR u.id = :uid2 OR u.id = :uid3) AND u.name = :name');
+    }
 
     public function testAndWhere()
     {
@@ -681,4 +692,44 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
         
         $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.groups g', $qb->getDQL());
     }
+    
+    /**
+     * @group DDC-1211
+     */
+    public function testEmptyStringLiteral()
+    {
+        $expr = $this->_em->getExpressionBuilder();
+        $qb = $this->_em->createQueryBuilder()
+            ->select('u')
+            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
+            ->where($expr->eq('u.username', $expr->literal("")));
+        
+        $this->assertEquals("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = ''", $qb->getDQL());
+    }
+    
+    /**
+     * @group DDC-1211
+     */
+    public function testEmptyNumericLiteral()
+    {
+        $expr = $this->_em->getExpressionBuilder();
+        $qb = $this->_em->createQueryBuilder()
+            ->select('u')
+            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
+            ->where($expr->eq('u.username', $expr->literal(0)));
+        
+        $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 0', $qb->getDQL());
+    }
+    
+    /**
+     * @group DDC-1227
+     */
+    public function testAddFromString()
+    {
+        $qb = $this->_em->createQueryBuilder()
+            ->add('select', 'u')
+            ->add('from', 'Doctrine\Tests\Models\CMS\CmsUser u');
+        
+        $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
+    }
 }

tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml

@@ -26,12 +26,12 @@
         </one-to-one>
         
         <one-to-many field="phonenumbers" target-entity="Doctrine\Tests\ORM\Tools\Export\Phonenumber" mapped-by="user">
-            <order-by>
-                <order-by-field name="number" direction="ASC" />
-            </order-by>
             <cascade>
                 <cascade-persist/>
             </cascade>
+            <order-by>
+                <order-by-field name="number" direction="ASC" />
+            </order-by>
         </one-to-many>
         
         <many-to-many field="groups" target-entity="Doctrine\Tests\ORM\Tools\Export\Group">

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -297,6 +297,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             }
         }
         
+        if (isset($GLOBALS['db_event_subscribers'])) {
+            foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
+                $subscriberInstance = new $subscriberClass();
+                $evm->addEventSubscriber($subscriberInstance);
+            }
+        }
+        
         return \Doctrine\ORM\EntityManager::create($conn, $config);
     }
 

tests/Doctrine/Tests/TestUtil.php

@@ -77,17 +77,7 @@ class TestUtil
                 }
             }
 
-            $eventManager = null;
-            if (isset($GLOBALS['db_event_subscribers'])) {
-                $eventManager = new \Doctrine\Common\EventManager();
-                foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) {
-                    $subscriberInstance = new $subscriberClass();
-                    $eventManager->addEventSubscriber($subscriberInstance);
-                }
-            }
-
-            $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, $eventManager);
-
+            $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, null);
         } else {
             $params = array(
                 'driver' => 'pdo_sqlite',