diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-15 06:06:53 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-15 06:06:53 -0700 |
| commit | 00519985f3a8091c41f9038db72bb7129e5bb37d (patch) | |
| tree | ba2fda07a5f8508178f8fad2f1f38c10909dce37 /activerecord/lib/active_record | |
| parent | be4fac3c0ce80b8a739bba21dba6ac6c1eca9987 (diff) | |
| parent | 6d10d64cbafe70e343cef0f94e015908b9348ac5 (diff) | |
| download | rails-00519985f3a8091c41f9038db72bb7129e5bb37d.tar.gz rails-00519985f3a8091c41f9038db72bb7129e5bb37d.tar.bz2 rails-00519985f3a8091c41f9038db72bb7129e5bb37d.zip | |
Merge pull request #10907 from senny/fixtures_and_database_url
fixture setup does not rely on `AR::Base.configurations`.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 33e19313a0..70eda332b3 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -841,8 +841,6 @@ module ActiveRecord end def setup_fixtures - return if ActiveRecord::Base.configurations.blank? - if pre_loaded_fixtures && !use_transactional_fixtures raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures' end @@ -875,8 +873,6 @@ module ActiveRecord end def teardown_fixtures - return if ActiveRecord::Base.configurations.blank? - # Rollback changes if a transaction is active. if run_in_transaction? @fixture_connections.each do |connection| |