Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1267 - order by broken in pagination logic (reverts #1220) #1283

Conversation

Ocramius
Copy link
Member

This PR reverts #1220 and merges #1267

austinsmorris and others added 2 commits January 24, 2015 13:07
…tput-only-once'"

This reverts commit 8f097ab, reversing
changes made to b23a8dd.

Conflicts:
	tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
@doctrinebot
Copy link

Hello,

thank you for creating this pull request. I have automatically opened an issue
on our Jira Bug Tracker for you. See the issue link:

http://www.doctrine-project.org/jira/browse/DDC-3538

We use Jira to track the state of pull requests and the versions they got
included in.

@@ -208,37 +207,7 @@ public function testCountQueryWithArithmeticOrderByCondition()
$query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');

$this->assertSame(
'SELECT DISTINCT id_0, (1 - 1000) * 1 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1 FROM Author a0_) dctrn_result ORDER BY (1 - 1000) * 1 DESC',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zeroedin-bill what should I do about these tests?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert them for now- leaving on vacation today, returning Feb. 1- I'll
devise a fix then. Would appreciate some guidance per my comment in the
failing testcase PR thread. Ciao--
On Jan 24, 2015 7:15 AM, "Marco Pivetta" [email protected] wrote:

In
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
#1283 (comment):

@@ -208,37 +207,7 @@ public function testCountQueryWithArithmeticOrderByCondition()
$query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');

     $this->assertSame(
  •        'SELECT DISTINCT id_0, (1 - 1000) \* 1 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1 FROM Author a0_) dctrn_result ORDER BY (1 - 1000) \* 1 DESC',
    

@zeroedin-bill https://github.com/zeroedin-bill what should I do about
these tests?


Reply to this email directly or view it on GitHub
https://github.com/doctrine/doctrine2/pull/1283/files#r23496003.

Ocramius added a commit that referenced this pull request Jan 24, 2015
…n-pagination-logic

#1267 - order by broken in pagination logic (reverts #1220)
@Ocramius Ocramius merged commit 4a05e19 into doctrine:master Jan 24, 2015
@Ocramius Ocramius deleted the hotfix/#1267-order-by-broken-in-pagination-logic branch January 24, 2015 18:20
@austinsmorris
Copy link
Contributor

Thanks @Ocramius!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants