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 /railties/lib | |
| 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 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index e18aeda0d0..e152a95fd3 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -301,7 +301,7 @@ module Rails # %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql ) case options[:database] when "mysql" then ["mysql2", ["~> 0.4.4"]] - when "postgresql" then ["pg", ["~> 0.18"]] + when "postgresql" then ["pg", [">= 0.18", "< 2.0"]] when "oracle" then ["activerecord-oracle_enhanced-adapter", nil] when "frontbase" then ["ruby-frontbase", nil] when "sqlserver" then ["activerecord-sqlserver-adapter", nil] |