diff --git a/CHANGELOG b/CHANGELOG index 65af3ba..7c46ec5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ *0.9.1* * Rails 2.3 compatibility +* Prefer Rails.root to RAILS_ROOT *0.9.0* diff --git a/lib/unit_record/disconnected_active_record.rb b/lib/unit_record/disconnected_active_record.rb index 6a5af1a..608c348 100644 --- a/lib/unit_record/disconnected_active_record.rb +++ b/lib/unit_record/disconnected_active_record.rb @@ -14,7 +14,11 @@ def disconnect!(options = {}) UnitRecord.base_rails_test_class.disconnect! ActiveRecord::Migration.verbose = false ActiveRecord::Base.connection.change_strategy(:noop) do - load(RAILS_ROOT + "/db/schema.rb") + if defined?(Rails.root) && Rails.root + load(File.join(Rails.root, 'db', 'schema.rb')) + else + load(RAILS_ROOT + "/db/schema.rb") + end end end end