mirror of
https://github.com/brianhempel/active_record_union
synced 2023-03-27 23:21:57 -04:00
Unbreak Travis for Rails 5.x
This commit is contained in:
parent
4e14a9f3ae
commit
ac7754ae76
6 changed files with 10 additions and 14 deletions
|
@ -4,7 +4,6 @@ addons:
|
||||||
rvm:
|
rvm:
|
||||||
- 2.3.6
|
- 2.3.6
|
||||||
gemfile:
|
gemfile:
|
||||||
- rails_4_2.gemfile
|
|
||||||
- rails_5_0.gemfile
|
- rails_5_0.gemfile
|
||||||
- rails_5_1.gemfile
|
- rails_5_1.gemfile
|
||||||
- rails_5_2.gemfile
|
- rails_5_2.gemfile
|
||||||
|
|
|
@ -17,7 +17,7 @@ user_1.posts.union(user_2.posts).union(Post.published)
|
||||||
user_1.posts.union_all(user_2.posts)
|
user_1.posts.union_all(user_2.posts)
|
||||||
```
|
```
|
||||||
|
|
||||||
ActiveRecordUnion is tested against Rails 4.2, 5.0, 5.1, and 5.2. It may or may not work on Rails 4.0/4.1.
|
ActiveRecordUnion is tested against Rails 5.0, 5.1, and 5.2. It should also work on Rails 4.2. It may or may not work on Rails 4.0/4.1.
|
||||||
|
|
||||||
If you are using Postgres, you might alternatively check out [ActiveRecordExtended](https://github.com/georgekaraszi/ActiveRecordExtended) which includes support for unions as well as other goodies.
|
If you are using Postgres, you might alternatively check out [ActiveRecordExtended](https://github.com/georgekaraszi/ActiveRecordExtended) which includes support for unions as well as other goodies.
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
source 'https://rubygems.org'
|
|
||||||
|
|
||||||
# Specify your gem's dependencies in active_record_union.gemspec
|
|
||||||
gemspec
|
|
||||||
|
|
||||||
gem 'rails', '~> 4.2.7'
|
|
||||||
|
|
||||||
# On Rails < 5.2, only pg < v1 is supported. See:
|
|
||||||
# https://github.com/rails/rails/pull/31671
|
|
||||||
# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
|
|
||||||
gem 'pg', '~> 0.21'
|
|
|
@ -9,3 +9,5 @@ gem 'rails', '~> 5.0.0'
|
||||||
# https://github.com/rails/rails/pull/31671
|
# https://github.com/rails/rails/pull/31671
|
||||||
# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
|
# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
|
||||||
gem 'pg', '~> 0.21'
|
gem 'pg', '~> 0.21'
|
||||||
|
|
||||||
|
gem 'sqlite3'
|
||||||
|
|
|
@ -9,3 +9,5 @@ gem 'rails', '~> 5.1.0'
|
||||||
# https://github.com/rails/rails/pull/31671
|
# https://github.com/rails/rails/pull/31671
|
||||||
# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
|
# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
|
||||||
gem 'pg', '~> 0.21'
|
gem 'pg', '~> 0.21'
|
||||||
|
|
||||||
|
gem 'sqlite3'
|
||||||
|
|
|
@ -4,4 +4,8 @@ source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
# pg v1.0+ compatibility, https://github.com/rails/rails/pull/31671:
|
# pg v1.0+ compatibility, https://github.com/rails/rails/pull/31671:
|
||||||
gem 'rails', '~> 5.2.0.beta2', git: 'https://github.com/rails/rails', ref: 'f1af27fd9d9101684b26d0dcf2028859d67bec1f'
|
gem 'rails', '~> 5.2.0'
|
||||||
|
|
||||||
|
gem 'pg'
|
||||||
|
|
||||||
|
gem 'sqlite3'
|
||||||
|
|
Loading…
Reference in a new issue