Codestin Search App

billschaller · 2015-03-27T20:47:31Z

This PR fixes issues reported in #1347 and #1351.

Ordering a query by a column from an association which uses SINGLE_TABLE inheritance no longer throws an error.
Limiting a query which is ordered by fields from a joined -To-Many association now works as expected.

This patch converts LimitSubqueryOutputWalker to use the ROW_NUMBER window function for queries on platforms that support it. Other platforms use a modified version of the previous method. The modification is to not select the ORDER BY columns in the wrapping query. The reason those columns were selected like that in the first place is that ORDER BY on columns not in the select list is unsupported on many platforms. MySQL and SQLite are fine with it, and don't support ROW_NUMBER.

The ROW_NUMBER solution is actually much simpler.

LimitSubqueryOutputWalker SQL generation tests for PG and Oracle have been changed.

There are 2 failing expectedException tests right now. The LimitSubqueryWalker needs to be modified to throw an exception when it detects a query that does the following things together:

Joins a -To-Many association
Orders by a column from the associated entity
Limits the result

As with the previous patch, this depends on changes to SQLServerPlatform2008 that have not yet been merged. SQLServerPlatform2008 in DBAL/master currently mangles the generated queries when trying to apply LIMIT/OFFSET.

…nheritance

…association. Manual merge testcase from doctrine#1351

…606-testcase

Conflicts: tests/Doctrine/Tests/OrmFunctionalTestCase.php

doctrinebot · 2015-03-27T20:47:45Z

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-3645

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

billschaller · 2015-03-27T20:49:24Z

@vaheshadunts @alexander-orabey I believe this fixes both of your issues... Please test.

billschaller · 2015-03-27T20:49:42Z

@mrkrstphr Does this fix your issue?

mrkrstphr · 2015-03-30T00:03:19Z

@zeroedin-bill no, it does not. I will try to write a failing test tomorrow.

billschaller · 2015-03-30T00:10:22Z

@mrkrstphr Ok, thanks - the functional testsuite is taking shape, and that should help prevent regressions like this in the future.

What platform are you running on?

mrkrstphr · 2015-03-30T00:13:46Z

Test suite runs in sqlite.

vaheshadunts · 2015-03-30T11:00:34Z

@zeroedin-bill as I see its ok in travis, I'll merge and test it later, thanks.

antanas-arvasevicius · 2015-03-30T11:45:11Z

Hi, I don't know is it related but now this query is throwing exception

        $q = $this->entityManager->createQuery(
            '
SELECT entity FROM System\Entity\SimpleEntity entity
WHERE  ((SELECT COUNT(simple.id) FROM System\Entity\SimpleEntity AS simple) = 1)
ORDER BY entity.id DESC
        '
        );
        $q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
        $list = $q->getScalarResult();

Exception:

An exception occurred while executing 'SELECT DISTINCT id_0 FROM (SELECT s0_.id AS id_0, s0_.name AS name_1, s1_.id AS id_2 FROM simple_entity s0_ WHERE ((SELECT COUNT(s1_.id) AS dctrn__1 FROM simple_entity s1_) = 1)) dctrn_result ORDER BY id_0 DESC':

SQLSTATE[42S22]: Column not found: 1054 Unknown column 's1_.id' in 'field list'

If I remove ORDER BY entity.id DESC from query then it runs fine.

Now its impossible to use Paginator when where is ordering and subquery with count()

SimpleEntity - is just an entity with id and name columns.

mrkrstphr · 2015-03-30T12:52:36Z

@zeroedin-bill it looks like our issue is cases that use table inheritance with an inheritance type of JOINED.

For a test case, should I put that in PaginatorTest or in Functional\Ticket somewhere?

billschaller · 2015-03-30T13:14:40Z

Since most of PaginationTest is new, and it hasn't been merged, please put
it into PaginationTest - I'll merge it into my PR branch.

Thanks!
On Mar 30, 2015 8:52 AM, "Kristopher Wilson" [email protected]
wrote:

@zeroedin-bill https://github.com/zeroedin-bill it looks like our issue
is cases that use table inheritance with an inheritance type of JOINED.

For a test case, should I put that in PaginatorTest or in
Functional\Ticket somewhere?

—
Reply to this email directly or view it on GitHub
#1353 (comment).

Conflicts: tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php

…ause crashed

billschaller · 2015-03-30T14:50:45Z

@antanas-arvasevicius - fixed and added a testcase, thanks

mrkrstphr · 2015-03-30T15:18:58Z

@zeroedin-bill here is a failing test case: https://github.com/doctrine/doctrine2/compare/master...mrkrstphr:paginator-test-for-joined-inheritance?expand=1

billschaller · 2015-03-30T15:21:57Z

Great, thanks :)

Bill Schaller
Software and Support Engineer
Zeroed-In Technologies LLC
m: +1.336.601.0632 o: +1.410.242.6611 x2122
w: *http://www.zeroedin.com http://www.zeroedin.com/ *

On Mon, Mar 30, 2015 at 11:19 AM, Kristopher Wilson <
[email protected]> wrote:

@zeroedin-bill https://github.com/zeroedin-bill here is a failing test
case:
https://github.com/doctrine/doctrine2/compare/master...mrkrstphr:paginator-test-for-joined-inheritance?expand=1

—
Reply to this email directly or view it on GitHub
#1353 (comment).

…eritance' into paginator-fixes-take3 Conflicts: tests/Doctrine/Tests/ORM/Functional/PaginationTest.php

…table inheritance

billschaller · 2015-03-30T16:17:23Z

@mrkrstphr - merged and fixed.

stof · 2015-03-30T16:38:24Z

please don't add the underscore prefix. We are getting rid of it, not adding new ones

@stof - I actually ran into some really strange behavior with this. These properties were hiding the private ones from the parent class, but when I overrode walkSelectStatement, I was getting a notice saying that these private variables were undefined. It was really odd. I'll try backing the underscores out and see if I can reproduce.

Ideally these variables should just be protected on SqlWalker, but I didn't want to push changes too far out from LimitSubqueryOutputWalker.

Of course, when I try to reproduce, the error is gone...

@stof Please see http://www.doctrine-project.org/jira/browse/DDC-3688 - this is the issue I was talking about... Any ideas? Reference: #1220. This user is trying to use FOSUserBundle with the new code and is seeing this issue and others.

stof · 2015-03-30T16:48:40Z

should be typehinted

billschaller · 2015-03-30T17:29:21Z

@stof resolved comments, thanks

antanas-arvasevicius · 2015-03-30T17:34:56Z

@zeroedin-bill thank you very much!

… handled by LimitSubqueryOutputWalker

The failure comes into play when an entity has an attribute named differently from its corresponding column name.

mrkrstphr · 2015-03-31T17:39:14Z

@zeroedin-bill found another issue: billschaller#1

mrkrstphr · 2015-03-31T17:41:30Z

@zeroedin-bill commenting out this function call (https://github.com/zeroedin-bill/doctrine2/blob/paginator-fixes-take3/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php#L424) seems to fix it, and doesn't cause any other errors. Is this call necessary?

merged #1

…es different from column names

billschaller · 2015-03-31T18:00:05Z

@mrkrstphr fixed, thanks :)

mrkrstphr · 2015-03-31T18:19:58Z

Our test suite now passes with this branch. Thanks!

billschaller · 2015-03-31T18:24:05Z

@mrkrstphr Thanks for your help and testing 👍

…ation)

Ocramius · 2015-03-31T20:55:56Z

Merged into master at 82230cc - now tagging 2.5.0-RC2

Bill Schaller and others added 6 commits March 25, 2015 21:24

Fix LimitSubqueryOutputWalker when used on tables with joined table i…

0cd2f66

…nheritance

Fix paginator issues when ordering by a joined column from a to-many …

767bdc1

…association. Manual merge testcase from doctrine#1351

Merge remote-tracking branch 'remotes/origin/DDC-3637-fix' into DDC-3…

d50bf6b

…606-testcase

problem with LimitSubqueryOutputWalker when use InheritanceType

0b2c3a4

Conflicts: tests/Doctrine/Tests/OrmFunctionalTestCase.php

Cleanup

8d77071

Fix LimitSubqueryOutputWalkerTest

a9b1a82

This was referenced Mar 27, 2015

Fix #1347 #1349

Closed

Failing test cases regarding to #1325 #1337 #1351

Closed

problem with LimitSubqueryOutputWalker when use InheritanceType #1347

Closed

mrkrstphr and others added 3 commits March 30, 2015 09:24

test case for joined table inheritance pagination

af8ede1

Add test for paginating on a query with a subquery in the where clause

22c5d99

Conflicts: tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php

Fix issue where paginating on a query with a subquery in the where cl…

bde8e3f

…ause crashed

Bill Schaller added 2 commits March 30, 2015 11:25

Merge remote-tracking branch 'mrkrstphr/paginator-test-for-joined-inh…

dadd5b3

…eritance' into paginator-fixes-take3 Conflicts: tests/Doctrine/Tests/ORM/Functional/PaginationTest.php

Fix paginator when ordering by while selecting entities using joined …

0bece48

…table inheritance

stof reviewed Mar 30, 2015
View reviewed changes

Comment thread lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php Outdated

Copy link
Copy Markdown

Member

stof Mar 30, 2015

Choose a reason for hiding this comment

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

should be typehinted

resolve review comments from @stof

42b30a6

Add more detection in LimitSubqueryWalker for conditions that must be…

39e4b17

… handled by LimitSubqueryOutputWalker

Ocramius self-assigned this Mar 31, 2015

Ocramius added the Requires merge/review label Mar 31, 2015

Adding failing test case for PaginationTest

8d4b8e5

The failure comes into play when an entity has an attribute named differently from its corresponding column name.

Bill Schaller added 2 commits March 31, 2015 13:55

Merge pull request #1 from mrkrstphr/different-names

b415499

merged #1

Fix issue in LimitSubqueryOutputWalker with entities having field nam…

4d600df

…es different from column names

Ocramius added a commit that referenced this pull request Mar 31, 2015

#1353 #1347 #1351 - Removing double quotes (confusing)

6c5dbd8

Ocramius added a commit that referenced this pull request Mar 31, 2015

#1353 #1347 #1351 - s/inSubselect/inSubSelect (with docblock document…

ba00fc1

…ation)

Ocramius closed this in 82230cc Mar 31, 2015

This was referenced Dec 6, 2015

DDC-3637: [GH-1347] problem with LimitSubqueryOutputWalker when use InheritanceType #4464

Closed

DDC-3645: [GH-1353] Paginator fixes take3 #4473

Closed

DDC-3646: Do not select unused columns in inner queries of Paginator #4474

Open

joshlopes mentioned this pull request May 2, 2018

[Bug] ORDER BY and LIMIT using subqueries #7211

Open

Conversation

billschaller commented Mar 27, 2015

Uh oh!

doctrinebot commented Mar 27, 2015

Uh oh!

billschaller commented Mar 27, 2015

Uh oh!

billschaller commented Mar 27, 2015

Uh oh!

mrkrstphr commented Mar 30, 2015

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

mrkrstphr commented Mar 30, 2015 via email

Uh oh!

vaheshadunts commented Mar 30, 2015

Uh oh!

antanas-arvasevicius commented Mar 30, 2015

Uh oh!

mrkrstphr commented Mar 30, 2015

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

mrkrstphr commented Mar 30, 2015

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

stof Mar 30, 2015

Choose a reason for hiding this comment

Uh oh!

billschaller Mar 30, 2015

Choose a reason for hiding this comment

Uh oh!

billschaller Mar 30, 2015

Choose a reason for hiding this comment

Uh oh!

billschaller Apr 13, 2015

Choose a reason for hiding this comment

Uh oh!

stof Mar 30, 2015

Choose a reason for hiding this comment

Uh oh!

billschaller commented Mar 30, 2015

Uh oh!

antanas-arvasevicius commented Mar 30, 2015

Uh oh!

mrkrstphr commented Mar 31, 2015

Uh oh!

mrkrstphr commented Mar 31, 2015

Uh oh!

billschaller commented Mar 31, 2015

Uh oh!

mrkrstphr commented Mar 31, 2015

Uh oh!

billschaller commented Mar 31, 2015

Uh oh!

Ocramius commented Mar 31, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants