Release 2.4.1

composer.json

@@ -35,6 +35,6 @@
         }
     },
     "archive": {
-        "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar", "vendor/satooshi", "lib/vendor"]
+        "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar", "vendor/satooshi", "lib/vendor", "*.swp", "*coveralls.yml"]
     }
 }

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

@@ -190,17 +190,14 @@ class ArrayHydrator extends AbstractHydrator
                         ( ! isset($baseElement[$relationAlias]))
                     ) {
                         $baseElement[$relationAlias] = null;
-                    } else if (
-                        ( ! isset($baseElement[$relationAlias])) ||
-                        ( ! isset($this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]]))
-                    ) {
+                    } else if ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = $data;
                     }
                 }
 
                 $coll =& $baseElement[$relationAlias];
 
-                if ($coll !== null) {
+                if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
                 }
             } else {

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -2790,8 +2790,12 @@ class ClassMetadataInfo implements ClassMetadata
      */
     public function setSequenceGeneratorDefinition(array $definition)
     {
-        if (isset($definition['name']) && $definition['name'] == '`') {
-            $definition['name']   = trim($definition['name'], '`');
+        if ( ! isset($definition['sequenceName'])) {
+            throw MappingException::missingSequenceName($this->name);
+        }
+
+        if ($definition['sequenceName'][0] == '`') {
+            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 

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

@@ -264,6 +264,10 @@ class YamlDriver extends FileDriver
                     $mapping['columnDefinition'] = $idElement['columnDefinition'];
                 }
 
+                if (isset($idElement['options'])) {
+                    $mapping['options'] = $idElement['options'];
+                }
+
                 $metadata->mapField($mapping);
 
                 if (isset($idElement['generator'])) {

lib/Doctrine/ORM/Mapping/MappingException.php

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

lib/Doctrine/ORM/OptimisticLockException.php

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

lib/Doctrine/ORM/Query/AST/Functions/TrimFunction.php

@@ -20,6 +20,8 @@
 namespace Doctrine\ORM\Query\AST\Functions;
 
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
 /**
@@ -36,71 +38,60 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
 class TrimFunction extends FunctionNode
 {
     /**
-     * @var bool
+     * @var boolean
      */
     public $leading;
 
     /**
-     * @var bool
+     * @var boolean
      */
     public $trailing;
 
     /**
-     * @var bool
+     * @var boolean
      */
     public $both;
 
     /**
-     * @var bool
+     * @var boolean
      */
     public $trimChar = false;
 
+    /**
+     * @var \Doctrine\ORM\Query\AST\Node
+     */
     public $stringPrimary;
 
     /**
-     * @override
+     * {@inheritdoc}
      */
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker)
     {
-        $pos = AbstractPlatform::TRIM_UNSPECIFIED;
-        if ($this->leading) {
-            $pos = AbstractPlatform::TRIM_LEADING;
-        } else if ($this->trailing) {
-            $pos = AbstractPlatform::TRIM_TRAILING;
-        } else if ($this->both) {
-            $pos = AbstractPlatform::TRIM_BOTH;
-        }
+        $stringPrimary  = $sqlWalker->walkStringPrimary($this->stringPrimary);
+        $platform       = $sqlWalker->getConnection()->getDatabasePlatform();
+        $trimMode       = $this->getTrimMode();
+        $trimChar       = ($this->trimChar !== false)
+            ? $sqlWalker->getConnection()->quote($this->trimChar)
+            : false;
 
-        return $sqlWalker->getConnection()->getDatabasePlatform()->getTrimExpression(
-            $sqlWalker->walkStringPrimary($this->stringPrimary),
-            $pos,
-            ($this->trimChar != false) ? $sqlWalker->getConnection()->quote($this->trimChar) : false
-        );
+        return $platform->getTrimExpression($stringPrimary, $trimMode, $trimChar);
     }
 
     /**
-     * @override
+     * {@inheritdoc}
      */
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(Parser $parser)
     {
         $lexer = $parser->getLexer();
 
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
 
-        if (strcasecmp('leading', $lexer->lookahead['value']) === 0) {
-            $parser->match(Lexer::T_LEADING);
-            $this->leading = true;
-        } else if (strcasecmp('trailing', $lexer->lookahead['value']) === 0) {
-            $parser->match(Lexer::T_TRAILING);
-            $this->trailing = true;
-        } else if (strcasecmp('both', $lexer->lookahead['value']) === 0) {
-            $parser->match(Lexer::T_BOTH);
-            $this->both = true;
-        }
+        $this->parseTrimMode($parser);
 
         if ($lexer->isNextToken(Lexer::T_STRING)) {
             $parser->match(Lexer::T_STRING);
+
             $this->trimChar = $lexer->token['value'];
         }
 
@@ -112,4 +103,61 @@ class TrimFunction extends FunctionNode
 
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
+
+    /**
+     * @param \Doctrine\ORM\Query\Parser $parser
+     *
+     * @return integer
+     */
+    private function getTrimMode()
+    {
+        if ($this->leading) {
+            return AbstractPlatform::TRIM_LEADING;
+        }
+
+        if ($this->trailing) {
+            return AbstractPlatform::TRIM_TRAILING;
+        }
+
+        if ($this->both) {
+            return AbstractPlatform::TRIM_BOTH;
+        }
+
+        return AbstractPlatform::TRIM_UNSPECIFIED;
+    }
+
+    /**
+     * @param \Doctrine\ORM\Query\Parser $parser
+     *
+     * @return void
+     */
+    private function parseTrimMode(Parser $parser)
+    {
+        $lexer = $parser->getLexer();
+        $value = $lexer->lookahead['value'];
+
+        if (strcasecmp('leading', $value) === 0) {
+            $parser->match(Lexer::T_LEADING);
+
+            $this->leading = true;
+
+            return;
+        }
+
+        if (strcasecmp('trailing', $value) === 0) {
+            $parser->match(Lexer::T_TRAILING);
+
+            $this->trailing = true;
+
+            return;
+        }
+
+        if (strcasecmp('both', $value) === 0) {
+            $parser->match(Lexer::T_BOTH);
+
+            $this->both = true;
+
+            return;
+        }
+    }
 }

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

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

lib/Doctrine/ORM/Version.php

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

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

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

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

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

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

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

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

@@ -1066,6 +1066,31 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals(array('customtypeparent_source' => 'id'), $cm->associationMappings['friendsWithMe']['relationToSourceKeyColumns']);
         $this->assertEquals(array('customtypeparent_target' => 'id'), $cm->associationMappings['friendsWithMe']['relationToTargetKeyColumns']);
     }
+
+    /**
+     * @group DDC-2608
+     */
+    public function testSetSequenceGeneratorThrowsExceptionWhenSequenceNameIsMissing()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
+        $cm->setSequenceGeneratorDefinition(array());
+    }
+
+    /**
+     * @group DDC-2662
+     */
+    public function testQuotedSequenceName()
+    {
+        $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
+        $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $cm->setSequenceGeneratorDefinition(array('sequenceName' => '`foo`'));
+
+        $this->assertEquals(array('sequenceName' => 'foo', 'quoted' => true), $cm->sequenceGeneratorDefinition);
+    }
 }
 
 class MyNamespacedNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy
@@ -1092,4 +1117,4 @@ class MyPrefixNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy
     {
         return strtolower($this->classToTableName($className)) . '_' . $propertyName;
     }
-}
+}

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

@@ -394,6 +394,17 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
         );
     }
 
+    /**
+     * @group DDC-2668
+     */
+    public function testSupportsTrimLeadingZeroString()
+    {
+        $this->assertSqlGeneration(
+            "SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE TRIM(TRAILING '0' FROM u.name) != ''",
+            "SELECT c0_.name AS name0 FROM cms_users c0_ WHERE TRIM(TRAILING '0' FROM c0_.name) <> ''"
+        );
+    }
+
     // Ticket 894
     public function testSupportsBetweenClauseWithPositionalParameters()
     {