diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-01-11 14:31:37 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-01-11 14:31:37 -0500 |
| commit | 181836d894b0a198b150583fe4ac97dc70badcea (patch) | |
| tree | 7706aad8e8d23f91ca9d525eb797baa77226ccba /activerecord | |
| parent | 5e8c79a6fafb8d7a84c272b3c9a0474a0d01b471 (diff) | |
| parent | 13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb (diff) | |
| download | rails-181836d894b0a198b150583fe4ac97dc70badcea.tar.gz rails-181836d894b0a198b150583fe4ac97dc70badcea.tar.bz2 rails-181836d894b0a198b150583fe4ac97dc70badcea.zip | |
Merge pull request #31671 from larskanis/pg-1.0
PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 441be47fa1..9ac5a8760e 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Make sure we're using pg high enough for type casts and Ruby 2.2+ compatibility -gem "pg", "~> 0.18" +gem "pg", ">= 0.18", "< 2.0" require "pg" require "active_record/connection_adapters/abstract_adapter" |