Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add patch for Rails 5.2.x #31

Merged
merged 13 commits into from
Apr 11, 2018
Merged

Add patch for Rails 5.2.x #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b361ce0
Test with latest Rails versions
n-rodriguez Aug 7, 2017
8ba61ef
Test with latest Rails and Ruby versions
n-rodriguez Oct 8, 2017
2d779f0
Duplicate Rails 5.1 patches for Rails 5.2.0.beta2, declare new test s…
n-rodriguez Nov 30, 2017
e638c26
ThroughAssociation module has been removed in Rails 5.2
n-rodriguez Nov 30, 2017
8020810
Update AssociationScope patch
n-rodriguez Nov 30, 2017
6bd2af2
Update Preloader::Association patch
n-rodriguez Nov 30, 2017
90ff655
join_constraints are now built in AbstractReflection class, so move p…
n-rodriguez Nov 30, 2017
95768e9
Update method name
n-rodriguez Nov 30, 2017
139f66d
Add missing comment
n-rodriguez Nov 30, 2017
6c1e0e5
Fix ThroughAssociation patch
n-rodriguez Nov 30, 2017
34992a4
Test with latest Ruby versions
n-rodriguez Feb 15, 2018
e5b3d71
Test with latest Rails versions
n-rodriguez Feb 15, 2018
fdfb5f8
Remove useless AR patches.
n-rodriguez Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 56 additions & 26 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ sudo: false
cache: bundler

rvm:
- 2.2.7
- 2.3.4
- 2.2.9
- 2.3.6

gemfile:
- gemfiles/rails_4.0.0.gemfile
Expand Down Expand Up @@ -53,66 +53,96 @@ gemfile:
- gemfiles/rails_4.2.7.gemfile
- gemfiles/rails_4.2.7.1.gemfile
- gemfiles/rails_4.2.8.gemfile
- gemfiles/rails_4.2.9.gemfile
- gemfiles/rails_4.2.10.gemfile
- gemfiles/rails_5.0.0.gemfile
- gemfiles/rails_5.0.0.1.gemfile
- gemfiles/rails_5.0.1.gemfile
- gemfiles/rails_5.0.2.gemfile
- gemfiles/rails_5.0.3.gemfile
- gemfiles/rails_5.0.4.gemfile
- gemfiles/rails_5.0.5.gemfile
- gemfiles/rails_5.0.6.gemfile
- gemfiles/rails_5.1.0.gemfile
- gemfiles/rails_5.1.1.gemfile
- gemfiles/rails_5.1.2.gemfile
- gemfiles/rails_5.1.3.gemfile
- gemfiles/rails_5.1.4.gemfile
- gemfiles/rails_5.1.5.gemfile
- gemfiles/rails_5.2.0.gemfile

matrix:
include:
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_4.2.8.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_4.2.9.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_4.2.10.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.0.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.0.1.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.1.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.2.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.3.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.4.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.5.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.0.6.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.0.gemfile
- rvm: 2.4.1
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.1.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.2.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.3.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.4.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.1.5.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails_5.2.0.gemfile
exclude:
# These Rails versions are broken with the latest Ruby versions.
# They are fixed in the next version:
# https://github.com/rails/rails/blob/v4.0.6/activerecord/CHANGELOG.md
# https://github.com/rails/rails/blob/v4.1.2/activerecord/CHANGELOG.md
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.0.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.1.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.2.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.3.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.4.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.0.5.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.1.0.gemfile
- rvm: 2.2.7
- rvm: 2.2.9
gemfile: gemfiles/rails_4.1.1.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.0.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.1.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.2.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.3.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.4.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.0.5.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.1.0.gemfile
- rvm: 2.3.4
- rvm: 2.3.6
gemfile: gemfiles/rails_4.1.1.gemfile
10 changes: 10 additions & 0 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,23 @@ RAILS_VERSIONS = %w(
4.2.7
4.2.7.1
4.2.8
4.2.9
4.2.10
5.0.0
5.0.0.1
5.0.1
5.0.2
5.0.3
5.0.4
5.0.5
5.0.6
5.1.0
5.1.1
5.1.2
5.1.3
5.1.4
5.1.5
5.2.0
)

RAILS_VERSIONS.each do |version|
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/rails_4.2.10.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "4.2.10"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_4.2.9.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "4.2.9"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.0.4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.0.4"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.0.5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.0.5"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.0.6.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.0.6"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.1.2.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.1.2"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.1.3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.1.3"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.1.4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.1.4"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.1.5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.1.5"

gemspec :path => "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_5.2.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "5.2.0"

gemspec :path => "../"
2 changes: 2 additions & 0 deletions lib/store_base_sti_class.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
require 'store_base_sti_class_for_5_0'
elsif ActiveRecord::VERSION::STRING =~ /^5\.1/
require 'store_base_sti_class_for_5_1'
elsif ActiveRecord::VERSION::STRING =~ /^5\.2/
require 'store_base_sti_class_for_5_2'
end

module StoreBaseSTIClass
Expand Down
Loading