diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-08-16 15:01:18 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-08-16 16:40:16 +0100 |
| commit | 0d5a6f68dfb930816392f9711f0a6a52872bc72f (patch) | |
| tree | e694479b917209b37c1b47d588938a70006d26ab /activerecord/lib/active_record.rb | |
| parent | c6e57467a65a3ec998f06676154105f9617c22a6 (diff) | |
| download | rails-0d5a6f68dfb930816392f9711f0a6a52872bc72f.tar.gz rails-0d5a6f68dfb930816392f9711f0a6a52872bc72f.tar.bz2 rails-0d5a6f68dfb930816392f9711f0a6a52872bc72f.zip | |
In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rw-r--r-- | activerecord/lib/active_record.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index d63b9e3f24..511d402ee5 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -42,7 +42,7 @@ module ActiveRecord autoload :ActiveRecordError, 'active_record/errors' autoload :ConnectionNotEstablished, 'active_record/errors' autoload :ConnectionAdapters, 'active_record/connection_adapters/abstract_adapter' - + autoload :Aggregations autoload :Associations autoload :AttributeMethods @@ -72,6 +72,7 @@ module ActiveRecord autoload :Persistence autoload :QueryCache autoload :Reflection + autoload :Result autoload :Schema autoload :SchemaDumper autoload :Serialization |