Release 2.0.7

doctrine-mapping.xsd

@@ -168,7 +168,7 @@
   
   <xs:complexType name="discriminator-mapping">
     <xs:attribute name="value" type="xs:NMTOKEN" use="required"/>
-    <xs:attribute name="class" type="xs:NMTOKEN" use="required"/>
+    <xs:attribute name="class" type="xs:string" use="required"/>
   </xs:complexType>
   
   <xs:complexType name="discriminator-map">

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -1137,7 +1137,8 @@ class ClassMetadataInfo
      */
     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/XmlDriver.php

@@ -262,8 +262,8 @@ class XmlDriver extends AbstractFileDriver
                     $mapping['cascade'] = $this->_getCascadeMappings($oneToOneElement->cascade);
                 }
 
-                if (isset($oneToOneElement->{'orphan-removal'})) {
-                    $mapping['orphanRemoval'] = (bool)$oneToOneElement->{'orphan-removal'};
+                if (isset($oneToOneElement['orphan-removal'])) {
+                    $mapping['orphanRemoval'] = (bool)$oneToOneElement['orphan-removal'];
                 }
 
                 $metadata->mapOneToOne($mapping);
@@ -287,8 +287,8 @@ class XmlDriver extends AbstractFileDriver
                     $mapping['cascade'] = $this->_getCascadeMappings($oneToManyElement->cascade);
                 }
 
-                if (isset($oneToManyElement->{'orphan-removal'})) {
-                    $mapping['orphanRemoval'] = (bool)$oneToManyElement->{'orphan-removal'};
+                if (isset($oneToManyElement['orphan-removal'])) {
+                    $mapping['orphanRemoval'] = (bool)$oneToManyElement['orphan-removal'];
                 }
 
                 if (isset($oneToManyElement->{'order-by'})) {

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

@@ -266,6 +266,10 @@ class YamlDriver extends AbstractFileDriver
                     $mapping['cascade'] = $oneToOneElement['cascade'];
                 }
 
+                if (isset($oneToOneElement['orphanRemoval'])) {
+                    $mapping['orphanRemoval'] = (bool)$oneToOneElement['orphanRemoval'];
+                }
+
                 $metadata->mapOneToOne($mapping);
             }
         }
@@ -283,6 +287,10 @@ class YamlDriver extends AbstractFileDriver
                     $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
                 }
 
+                if (isset($oneToManyElement['orphanRemoval'])) {
+                    $mapping['orphanRemoval'] = (bool)$oneToManyElement['orphanRemoval'];
+                }
+
                 if (isset($oneToManyElement['cascade'])) {
                     $mapping['cascade'] = $oneToManyElement['cascade'];
                 }

lib/Doctrine/ORM/OptimisticLockException.php

@@ -33,6 +33,7 @@ class OptimisticLockException extends ORMException
 
     public function __construct($msg, $entity)
     {
+        parent::__construct($msg);
         $this->entity = $entity;
     }
 

lib/Doctrine/ORM/PersistentCollection.php

@@ -576,6 +576,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/Proxy/ProxyFactory.php

@@ -274,6 +274,14 @@ class <proxyClassName> extends \<className> implements \Doctrine\ORM\Proxy\Proxy
     {
         if (!$this->__isInitialized__ && $this->_entityPersister) {
             $this->__isInitialized__ = true;
+
+            if (method_exists($this, "__wakeup")) {
+                // call this after __isInitialized__to avoid infinite recursion
+                // but before loading to emulate what ClassMetadata::newInstance()
+                // provides.
+                $this->__wakeup();
+            }
+
             if ($this->_entityPersister->load($this->_identifier, $this) === null) {
                 throw new \Doctrine\ORM\EntityNotFoundException();
             }

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/Tools/EntityGenerator.php

@@ -439,7 +439,7 @@ public function <methodName>()
             } else if ($token[0] == T_FUNCTION) {
                 if ($tokens[$i+2][0] == T_STRING) {
                     $this->_staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+2][1];
-                } else if ($tokens[$i+2][0] == T_AMPERSAND && $tokens[$i+3][0] == T_STRING) {
+                } else if ($tokens[$i+2] == "&" && $tokens[$i+3][0] == T_STRING) {
                     $this->_staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+3][1];
                 }
             } else if (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i+2][0] != T_FUNCTION) {
@@ -679,6 +679,7 @@ public function <methodName>()
         if ($this->_hasMethod($methodName, $metadata)) {
             return;
         }
+        $this->_staticReflection[$metadata->name]['methods'][] = $methodName;
 
         $var = sprintf('_%sMethodTemplate', $type);
         $template = self::$$var;
@@ -711,6 +712,7 @@ public function <methodName>()
         if ($this->_hasMethod($methodName, $metadata)) {
             return;
         }
+        $this->_staticReflection[$metadata->name]['methods'][] = $methodName;
 
         $replacements = array(
             '<name>'        => $this->_annotationsPrefix . $name,

lib/Doctrine/ORM/Tools/SchemaTool.php

@@ -570,6 +570,26 @@ class SchemaTool
                 }
             }
         }
+        
+        if ($this->_platform->supportsSequences()) {
+            foreach ($schema->getSequences() AS $sequence) {
+                $visitor->acceptSequence($sequence);
+            }
+            foreach ($schema->getTables() AS $table) {
+                /* @var $sequence Table */
+                foreach ($table->getIndexes() AS $index) {
+                    if ($index->isPrimary()) {
+                        $columns = $index->getColumns();
+                        if (count($columns) == 1) {
+                            $checkSequence = $table->getName() . "_" . $columns[0] . "_seq";
+                            if ($fullSchema->hasSequence($checkSequence)) {
+                                $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         return $visitor->getQueries();
     }

lib/Doctrine/ORM/UnitOfWork.php

@@ -975,7 +975,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.
         }
 
@@ -990,6 +990,7 @@ class UnitOfWork implements PropertyChangedListener
         }
         if ( ! isset($this->entityDeletions[$oid])) {
             $this->entityDeletions[$oid] = $entity;
+            $this->entityStates[$oid] = self::STATE_REMOVED;
         }
     }
 
@@ -1446,7 +1447,8 @@ class UnitOfWork implements PropertyChangedListener
                         }
                         if ($assoc2['isCascadeMerge']) {
                             $managedCol->initialize();
-                            if (!$managedCol->isEmpty()) {
+                            // clear and set dirty a managed collection if its not also the same collection to merge from.
+                            if (!$managedCol->isEmpty() && $managedCol != $mergeCol) {
                                 $managedCol->unwrap()->clear();
                                 $managedCol->setDirty(true);
                                 if ($assoc2['isOwningSide'] && $assoc2['type'] == ClassMetadata::MANY_TO_MANY && $class->isChangeTrackingNotify()) {
@@ -1645,6 +1647,10 @@ class UnitOfWork implements PropertyChangedListener
             }
             $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity);
             if ($relatedEntities instanceof Collection) {
+                if ($relatedEntities === $class->reflFields[$assoc['fieldName']]->getValue($managedCopy)) {
+                    continue;
+                }
+
                 if ($relatedEntities instanceof PersistentCollection) {
                     // Unwrap so that foreach() does not initialize
                     $relatedEntities = $relatedEntities->unwrap();

lib/Doctrine/ORM/Version.php

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

tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php

@@ -56,6 +56,7 @@ class ECommerceProduct
     private $related;
 
     public $isCloned = false;
+    public $wakeUp = false;
 
     public function __construct()
     {
@@ -166,4 +167,12 @@ class ECommerceProduct
     {
         $this->isCloned = true;
     }
+
+    /**
+     * Testing docblock contents here
+     */
+    public function __wakeup()
+    {
+        $this->wakeUp = true;
+    }
 }

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/ReferenceProxyTest.php

@@ -130,4 +130,21 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id);
         $this->assertEquals('Doctrine 2 Cookbook', $entity->getName());
     }
+
+    /**
+     * @group DDC-1022
+     */
+    public function testWakeupCalledOnProxy()
+    {
+        $id = $this->createProduct();
+
+        /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */
+        $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id);
+
+        $this->assertFalse($entity->wakeUp);
+
+        $entity->setName('Doctrine 2 Cookbook');
+
+        $this->assertTrue($entity->wakeUp, "Loading the proxy should call __wakeup().");
+    }
 }

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

@@ -80,4 +80,25 @@ class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals("CREATE TABLE boolean_model (id INT NOT NULL, booleanField BOOLEAN NOT NULL, PRIMARY KEY(id))", $sql[0]);
         $this->assertEquals("CREATE SEQUENCE boolean_model_id_seq INCREMENT BY 1 MINVALUE 1 START 1", $sql[1]);
     }
+    
+    public function testGetDropSchemaSql()
+    {
+        $classes = array(
+            $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'),
+            $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'),
+            $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'),
+        );
+
+        $tool = new SchemaTool($this->_em);
+        $sql = $tool->getDropSchemaSQL($classes);
+        
+        $this->assertEquals(13, count($sql));
+        $dropSequenceSQLs = 0;
+        foreach ($sql AS $stmt) {
+            if (strpos($stmt, "DROP SEQUENCE") === 0) {
+                $dropSequenceSQLs++;
+            }
+        }
+        $this->assertEquals(4, $dropSequenceSQLs, "Expect 4 sequences to be dropped.");
+    }
 }

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsGroup;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1276
+ */
+class DDC1276Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testIssue()
+    {
+        $user = new CmsUser();
+        $user->name = "Benjamin";
+        $user->username = "beberlei";
+        $user->status = "active";
+        $this->_em->persist($user);
+
+        for ($i = 0; $i < 2; $i++) {
+            $group = new CmsGroup();
+            $group->name = "group".$i;
+            $user->groups[] = $group;
+            $this->_em->persist($group);
+        }
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->id);
+        $cloned = clone $user;
+        
+        $this->assertSame($user->groups, $cloned->groups);
+        $this->assertEquals(2, count($user->groups));
+        $this->_em->merge($cloned);
+
+        $this->assertEquals(2, count($user->groups));
+
+        $this->_em->flush();
+    }
+}

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

@@ -186,6 +186,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
         $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeRefresh']);
         $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeDetach']);
         $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeMerge']);
+        $this->assertTrue($class->associationMappings['phonenumbers']['orphanRemoval']);
 
         // Test Order By
         $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']);
@@ -329,7 +330,7 @@ class User
     public $address;
 
     /**
-     * @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"})
+     * @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"}, orphanRemoval=true)
      * @OrderBy({"number"="ASC"})
      */
     public $phonenumbers;
@@ -425,7 +426,7 @@ class User
            1 => 'persist',
            ),
            'mappedBy' => 'user',
-           'orphanRemoval' => false,
+           'orphanRemoval' => true,
            'orderBy' => 
            array(
            'number' => 'ASC',

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

@@ -232,6 +232,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/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php

@@ -60,7 +60,7 @@ $metadata->mapOneToMany(array(
    1 => 'persist',
    ),
    'mappedBy' => 'user',
-   'orphanRemoval' => false,
+   'orphanRemoval' => true,
    'orderBy' => 
    array(
    'number' => 'ASC',

tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml

@@ -35,7 +35,7 @@
             <join-column name="address_id" referenced-column-name="id" on-delete="CASCADE" on-update="CASCADE"/>
         </one-to-one>
         
-        <one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user">
+        <one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user" orphan-removal="true">
             <cascade>
                 <cascade-persist/>
             </cascade>

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

@@ -33,6 +33,7 @@ Doctrine\Tests\ORM\Mapping\User:
   oneToMany:
     phonenumbers:
       targetEntity: Phonenumber
+      orphanRemoval: true
       mappedBy: user
       orderBy:
         number: ASC

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

@@ -589,4 +589,32 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertEquals(2, $expr->count(), "Modifying the second query should affect the first one.");
     }
+
+    /**
+     * @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());
+    }
 }