kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ruby2.0: switch mysql2 platforms by RUBY_VERSION 

It seems old bundler does not support :mri_20 and :mingw_20

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11490 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-02-26 12:20:45 +00:00
parent 23941adee1
commit 9a8f430db6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -47,7 +47,8 @@ if File.exist?(database_file)
case adapter case adapter
when /mysql/ when /mysql/
gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18] gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18]
gem "mysql2", "~> 0.3.11", :platforms => [:mri_19, :mingw_19, :mri_20, :mingw_20] mysql2_platforms = RUBY_VERSION >= '2.0' ? [:mri_20, :mingw_20] : [:mri_19, :mingw_19]
gem "mysql2", "~> 0.3.11", :platforms => mysql2_platforms
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/ when /postgresql/
gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]