diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-28 17:20:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-28 17:20:28 +0000 |
| commit | 953b3619d49b4b1feb07e9714e6ebe4b1b961045 (patch) | |
| tree | bbce65ab42b51af15f72c00e2ca51e6c8fa12dfb /Gemfile | |
| parent | a5c05435abb4156603fddd896352870b43a78226 (diff) | |
| download | redmine-953b3619d49b4b1feb07e9714e6ebe4b1b961045.tar.gz redmine-953b3619d49b4b1feb07e9714e6ebe4b1b961045.zip | |
Distinguish mysql/mysql2 adapters in Gemfile (#13270).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11494 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -45,10 +45,11 @@ if File.exist?(database_file) if adapters.any? adapters.each do |adapter| case adapter - when /mysql/ - gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18] - mysql2_platforms = RUBY_VERSION >= '2.0' ? [:mri_20, :mingw_20] : [:mri_19, :mingw_19] - gem "mysql2", "~> 0.3.11", :platforms => mysql2_platforms + when 'mysql2' + gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby + when 'mysql' + gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when /postgresql/ gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] |