Skip to content

Commit a826fc6

Browse files
committed
Fixed compatibility
Fixed things after review Fixed tests
1 parent c7d38c2 commit a826fc6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Pagerfanta/Adapter/DoctrineORMNativeQueryAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function getSlice($offset, $length)
8383
{
8484
$query = $this->cloneQuery();
8585

86-
if ($this->countQueryBuilderModifier !== null) {
86+
if ($this->sliceQueryBuilderModifier !== null) {
8787
call_user_func($this->sliceQueryBuilderModifier, $query, $offset, $length);
8888
} else {
8989
$this->sliceQueryBuilder($query, $offset, $length);
@@ -116,7 +116,7 @@ private function countQueryBuilder(NativeQuery $query)
116116
private function sliceQueryBuilder(NativeQuery $query, $offset, $length)
117117
{
118118
$sql = $query->getSql();
119-
$sql .= ' LIMIT ' . $offset . ', '. $length;
119+
$sql .= ' LIMIT ' . $length . ' OFFSET '. $offset;
120120
$query->setSQL($sql);
121121
}
122122
}

tests/Pagerfanta/Tests/Adapter/DoctrineORMNativeQueryAdapterTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public function setUp()
2121
parent::setUp();
2222

2323
$schemaTool = new SchemaTool($this->entityManager);
24-
$schemaTool->createSchema([
24+
$schemaTool->createSchema(array(
2525
$this->entityManager->getClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\User'),
2626
$this->entityManager->getClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Group'),
2727
$this->entityManager->getClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Person'),
28-
]);
28+
));
2929

3030
$this->user1 = $user = new User();
3131
$this->user2 = $user2 = new User();
@@ -74,8 +74,8 @@ public function testAdapterCountFetchJoin()
7474

7575
$rsm = new ResultSetMappingBuilder($this->entityManager);
7676
$rsm->addRootEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\User', 'u');
77-
$rsm->addJoinedEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Group', 'g', 'u', 'groups', ['id' => 'user_id']);
78-
$sql = "SELECT " . $rsm->generateSelectClause(['u' => 'u', 'g' => 'g']) .
77+
$rsm->addJoinedEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Group', 'g', 'u', 'groups', array('id' => 'user_id'));
78+
$sql = "SELECT u.id AS id, g.id AS user_id" .
7979
" FROM User u INNER JOIN user_group ug ON u.id = ug.user_id LEFT JOIN groups g ON g.id = ug.group_id"
8080
;
8181

@@ -103,8 +103,8 @@ public function testGetSliceFetchJoin()
103103
{
104104
$rsm = new ResultSetMappingBuilder($this->entityManager);
105105
$rsm->addRootEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\User', 'u');
106-
$rsm->addJoinedEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Group', 'g', 'u', 'groups', ['id' => 'user_id']);
107-
$sql = "SELECT " . $rsm->generateSelectClause(['u' => 'u', 'g' => 'g']) .
106+
$rsm->addJoinedEntityFromClassMetadata('Pagerfanta\Tests\Adapter\DoctrineORM\Group', 'g', 'u', 'groups', array('id' => 'user_id'));
107+
$sql = "SELECT u.id AS id, g.id AS user_id" .
108108
" FROM User u INNER JOIN user_group ug ON u.id = ug.user_id LEFT JOIN groups g ON g.id = ug.group_id"
109109
;
110110

0 commit comments

Comments
 (0)