Rails 5 Support, Require ruby 2.0 #303
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
alias defines these on ActiveRecord::Base itself, which is not what was intended. This behaviour previous differed between MRI and jruby.
We are switching to support of ruby 2.0 and greater. We will only support jruby OVER 9000 for feature parity.
It is unnecessary to test the AR internals here. Testing the where_values_hash should be sufficient.
In rails 4.x this passed around a set of arel conditions, in rails 5 it passes around an AR::Relation and uses where(). See rails/rails@5f521cb
Also updates ruby versions
Just for consitency. alias_method is easier to reason about than only_deleted.
jhawthorn
added a commit
that referenced
this pull request
Feb 3, 2016
Rails 5 Support, Require ruby 2.0
|
Thanks, @jhawthorn. This is excellent. |
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.
Alternative to #284 #290 #302. Thanks to @pigeonworks @halostatue and @gagalago whose work this is based on. I tried to credit as best as possible using cherry-picks and the changelog.
This code will form the basis of paranoia
2.2.0. This explicitly requires ruby >= 2.0, which we stopped testing against in2.1.2, but probably still worked. Because of the ruby 2.0 requirement we are now testing against jruby 9.0.5.0, which required a change because of inconsistent behaviour ofaliasvsalias_method. Currently jruby doesn't seem to work with rails 5.0.0.beta1.1, so that combination is an allowed failure on travis.I am merging this into the
rails4branch, which I am going to maintain as a branch compatible with both rails 4 and rails 5. I might rename the branchmasterto avoid confusion (and because I don't want to work on the rails3 branch other than bug fixes).