diff options
| author | Vishnu Atrai <me@vishnuatrai.com> | 2011-07-22 17:43:30 +0530 |
|---|---|---|
| committer | Vishnu Atrai <me@vishnuatrai.com> | 2011-07-22 17:49:24 +0530 |
| commit | 1efd88283ef68d912df215125951a87526768a51 (patch) | |
| tree | 492d24c8ddbe4dc816031e7f599f0eae5087d932 | |
| parent | 5b6121aa3428f4fc0f12fd797abde143b97650fb (diff) | |
| download | rails-1efd88283ef68d912df215125951a87526768a51.tar.gz rails-1efd88283ef68d912df215125951a87526768a51.tar.bz2 rails-1efd88283ef68d912df215125951a87526768a51.zip | |
lazy load ConnectionAdapters remove require.
| -rw-r--r-- | activerecord/lib/active_record.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 59cf42a377..d63b9e3f24 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -41,7 +41,8 @@ module ActiveRecord eager_autoload do autoload :ActiveRecordError, 'active_record/errors' autoload :ConnectionNotEstablished, 'active_record/errors' - + autoload :ConnectionAdapters, 'active_record/connection_adapters/abstract_adapter' + autoload :Aggregations autoload :Associations autoload :AttributeMethods diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 25074c2d4f..00f986b3ce 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2163,6 +2163,4 @@ MSG end end -# TODO: Remove this and make it work with LAZY flag -require 'active_record/connection_adapters/abstract_adapter' ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base) |