Handle arbitrary whitespaces when parsing SQL in order to apply LIMIT for MS SQL Server
#2372
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -115,12 +115,16 @@ protected function doModifyLimitQuery($query, $limit, $offset = null) | |||
|
|
|||
| // Queries using OFFSET... FETCH MUST have an ORDER BY clause | |||
| // Find the position of the last instance of ORDER BY and ensure it is not within a parenthetical statement | |||
| $orderByPos = strripos($query, " ORDER BY "); | |||
|
|
|||
| if (preg_match_all('/\s+ORDER\s+BY\s+/i', $query, $matches, PREG_OFFSET_CAPTURE)) { | |||
There was a problem hiding this comment.
See the line below. The $orderByPos is obtained from the captured offset.
|
@morozov Does the test suite pass? Logic change looks fine to me but 😩 @ SQL Server... |
|
@zeroedin-bill I only ran the new test locally, while at the moment I submitted this PR, the whole build on Travis was far from stable. |
|
@morozov thanks! |
|
Decided to target this PR for |
… for MS SQL Server
morozov
force-pushed
the
sql-server-limit
branch
from
2ca3884 to
81dd0b7
Compare
|
Rebased and resolved merge conflicts with #2428. |
|
This goes in! Thanks @morozov! |
Ocramius
changed the title
LIMIT for MS SQL Server
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Given that the DBAL and QueryBuilder allow using plain SQL queries or their chunks, the DBAL should properly parse queries containing line breaks or other arbitrary formatting. Currently
SQLServerPlatform::doModifyLimitQuery()(andSQLServer2012Platform::doModifyLimitQuery()which is not released yet) produce invalid SQL in case if the original query contains line breaks or other whitespaces.