diff --git a/tests/Doctrine/Tests/Models/Pagination/Company.php b/tests/Doctrine/Tests/Models/Pagination/Company.php index 9c6b34dcd..65f7e0c53 100644 --- a/tests/Doctrine/Tests/Models/Pagination/Company.php +++ b/tests/Doctrine/Tests/Models/Pagination/Company.php @@ -23,6 +23,11 @@ class Company */ public $name; + /** + * @Column(type="string", name="jurisdiction_code", nullable=true) + */ + public $jurisdiction; + /** * @OneToOne(targetEntity="Logo", mappedBy="company", cascade={"persist"}, orphanRemoval=true) */ diff --git a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php index e0e5cc1d7..efd8a7c2c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php @@ -602,6 +602,20 @@ class PaginationTest extends \Doctrine\Tests\OrmFunctionalTestCase count($paginator); } + /** + * Test using a paginator when the entity attribute name and corresponding column name are not the same. + */ + public function testPaginationWithColumnAttributeNameDifference() + { + $dql = 'SELECT c FROM Doctrine\Tests\Models\Pagination\Company c ORDER BY c.id'; + $query = $this->_em->createQuery($dql); + + $paginator = new Paginator($query); + $paginator->getIterator(); + + $this->assertCount(9, $paginator->getIterator()); + } + public function testCloneQuery() { $dql = 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u';