diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php index 205be7d1f..f20a0e481 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php @@ -350,5 +350,24 @@ ORDER BY b.id DESC' $query->getSQL() ); } + + /** + * This tests ordering by property that has the 'declared' field. + */ + public function testLimitSubqueryOrderByFieldFromMappedSuperclass() + { + $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); + + // now use the third one in query + $query = $this->entityManager->createQuery( + 'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\Banner b ORDER BY b.id DESC' + ); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + + $this->assertEquals( + 'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.name AS name_1 FROM Banner b0_) dctrn_result ORDER BY id_0 DESC', + $query->getSQL() + ); + } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php index f1553c13c..fe8ee0f82 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php @@ -168,4 +168,23 @@ class Avatar public $image_width; /** @Column(type="string", length=255) */ public $image_alt_desc; -} \ No newline at end of file +} + +/** @MappedSuperclass */ +abstract class Identified +{ + /** @Id @Column(type="integer") @GeneratedValue */ + private $id; + + public function getId() + { + return $this->id; + } +} + +/** @Entity */ +class Banner extends Identified +{ + /** @Column(type="string") */ + public $name; +}