Merge branch 'master' of github.com:jruby/activerecord-jdbc-adapter

bwalsh · Feb 2, 2012 · 9c28edc · 9c28edc
2 parents 114d6f7 + 7e5b6ba
commit 9c28edc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # This may wreak havoc on the lockfile, but we need a way to test
 # different AR versions
 gem 'activerecord', ENV['AR_VERSION']
+gem 'rails', ENV['AR_VERSION']
 
 gem 'rake'
 gem 'appraisal'

diff --git a/test/abstract_db_create.rb b/test/abstract_db_create.rb
@@ -83,7 +83,7 @@ def setup_rails2
     ar_version = $LOADED_FEATURES.grep(%r{active_record/version}).first
     ar_lib_path = $LOAD_PATH.detect {|p| p if File.exist?File.join(p, ar_version)}
     ar_lib_path = ar_lib_path.sub(%r{activerecord/lib}, 'railties/lib') # edge rails
-    rails_lib_path = ar_lib_path.sub(/activerecord-([^\/]+)/, 'rails-\1') # gem rails
+    rails_lib_path = ar_lib_path.sub(/activerecord-([\d\.]+)/, 'rails-\1') # gem rails
     load "#{rails_lib_path}/tasks/databases.rake"
   end