aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-02-15 15:05:00 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-15 15:05:52 -0800
commit13e72db77063f57c3028a906690d42fb068845bb (patch)
tree2ff9bd8982be0991d3210f94037efe91b9bd154a /activerecord/lib/active_record
parentef573342106369b07bb5c97a0db0b121d6d18621 (diff)
downloadrails-13e72db77063f57c3028a906690d42fb068845bb.tar.gz
rails-13e72db77063f57c3028a906690d42fb068845bb.tar.bz2
rails-13e72db77063f57c3028a906690d42fb068845bb.zip
this is in the AR namespace, so AR must exist
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/fixtures.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 8b97a5b8cc..c297901fb0 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -915,7 +915,7 @@ module ActiveRecord
end
def setup_fixtures
- return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+ return unless !ActiveRecord::Base.configurations.blank?
if pre_loaded_fixtures && !use_transactional_fixtures
raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'