Fix 'dangerous errors' when using in Rails 5.2 #384
Merged
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
lib/ancestry/has_ancestry.rb
Outdated
| @@ -46,7 +46,7 @@ def has_ancestry options = {} | |||
| scope :siblings_of, lambda { |object| where(sibling_conditions(object)) } | |||
| scope :ordered_by_ancestry, Proc.new { |order| | |||
| if %w(mysql mysql2 sqlite sqlite3 postgresql).include?(connection.adapter_name.downcase) && ActiveRecord::VERSION::MAJOR >= 5 | |||
| reorder("coalesce(#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}, '')", order) | |||
| reorder(Arel.sql("coalesce(#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}, '')"), order) | |||
| else | |||
| reorder("(CASE WHEN #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)} IS NULL THEN 0 ELSE 1 END), #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}", order) | |||
There was a problem hiding this comment.
You might want to include an Arel.sql call in the else branch too.
There was a problem hiding this comment.
thanks - thought it is specifically for AR < 5 && non pg.
will see if it passes rails 3.x with Arel
There was a problem hiding this comment.
It'll go into the CASE version for any driver that isn't MySQL, SQLite, or PostgreSQL regardless of the ActiveRecord major version.
That said, that's an odd looking test to me, the AR version shouldn't matter and I'm pretty sure every database these days has a coalesce function. But maybe I'm wrong and this is just bike-shedding anyway
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.
ancestry_wasfor now to make tests passJust trying to make this pass for now. Not sure if it is actually working with rails 5.2