aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorkares <self@kares.org>2013-09-03 08:33:00 +0200
committerkares <self@kares.org>2013-09-03 08:33:00 +0200
commit0a4683055dbc1d80d7f8680bddc462c6bd3e4e3a (patch)
tree914efa236feabbd8f7df60bdc17d61eae54e9e98 /Gemfile
parent90ea6f928ce0f0efef3109045a74469c4a3e3f99 (diff)
downloadrails-0a4683055dbc1d80d7f8680bddc462c6bd3e4e3a.tar.gz
rails-0a4683055dbc1d80d7f8680bddc462c6bd3e4e3a.tar.bz2
rails-0a4683055dbc1d80d7f8680bddc462c6bd3e4e3a.zip
allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile17
1 files changed, 12 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 7ac743cbd6..94eec28867 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,11 +62,18 @@ end
platforms :jruby do
gem 'json'
- gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
-
- group :db do
- gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
- gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+ if ENV['AR_JDBC']
+ gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ group :db do
+ gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ end
+ else
+ gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+ group :db do
+ gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
+ gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+ end
end
end