Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't #16649
Conversation
This file contains hidden or 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
agis
changed the title
agis
changed the title
|
The travis failures are irrelevant with the PR. |
| @@ -549,7 +549,8 @@ def columns_for_distinct(columns, orders) #:nodoc: | |||
| # Convert Arel node to string | |||
| s = s.to_sql unless s.is_a?(String) | |||
| # Remove any ASC/DESC modifiers | |||
| s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '') | |||
| s.gsub(/\s+(ASC|DESC)\s*/i, '') | |||
There was a problem hiding this comment.
Can keep the (?: on (?:ASC|DESC) - we don't use the capture
jeremy
referenced
this pull request
Aug 23, 2014
Fixed #columns_for_distinct of postgresql adapter Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md
|
Looking good. Ready for merge and backport. |
| @@ -549,7 +549,8 @@ def columns_for_distinct(columns, orders) #:nodoc: | |||
| # Convert Arel node to string | |||
| s = s.to_sql unless s.is_a?(String) | |||
| # Remove any ASC/DESC modifiers | |||
| s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '') | |||
| s.gsub(/\s+(?:ASC|DESC)\s*/i, '') | |||
| .gsub(/\s*NULLS\s+(?:FIRST|LAST)?\s*/i, '') | |||
There was a problem hiding this comment.
Why make (?:FIRST|LAST) optional?
Also, I don't like the fact that we don't require whitespace before NULLS. Can we just remove the trailing \s* from both expressions instead?
And let's end both with a \b, for similar reasons: we're looking for whole words here.
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
* Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..."
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
* Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..."
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
* Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't Conflicts: activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
* Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't Conflicts: activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
chancancode
added a commit
that referenced
this pull request
Aug 24, 2014
* Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..." Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md
|
Merged into master, 4-1-stable, 4-1-6, 4-0-stable, 4-0-10, along with a CHANGELOG entry and @matthewd's suggestions. Thank you all ❤️ 💚 💙 💛 💜 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes the regression described in #16623 present in 4.0.10rc1 & 4.1.6.rc1. It was introduced by 3d5a201.