diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-03-12 09:55:01 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-03-12 09:55:01 +0100 |
| commit | cc8d55544864a1f873e3167e21bfc0940e17a232 (patch) | |
| tree | d2c3796413914db39a9995f9410b389e017d6190 | |
| parent | 202c68c86c3d92ce92c6f9c1d8a110fa2bfbeb4e (diff) | |
| parent | ba7532700f194aae2f9968924f979d77bc84a21e (diff) | |
| download | rails-cc8d55544864a1f873e3167e21bfc0940e17a232.tar.gz rails-cc8d55544864a1f873e3167e21bfc0940e17a232.tar.bz2 rails-cc8d55544864a1f873e3167e21bfc0940e17a232.zip | |
Merge pull request #19299 from mattbrictson/pg-ruby-22
Require pg ~> 0.18 to ensure Ruby 2.2 compatibility
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 0f99f907e8..a011579124 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Increase pg gem version requirement to `~> 0.18`. Earlier versions of the + pg gem are known to have problems with Ruby 2.2. + + *Matt Brictson* + * Correctly dump `serial` and `bigserial`. *Ryuta Kamizono* diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 92f470ae70..96a3ac7c31 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -12,8 +12,8 @@ require "active_record/connection_adapters/statement_pool" require 'arel/visitors/bind_visitor' -# Make sure we're using pg high enough for PGResult#values -gem 'pg', '~> 0.15' +# Make sure we're using pg high enough for Ruby 2.2+ compatibility +gem 'pg', '~> 0.18' require 'pg' require 'ipaddr' |