diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-16 08:43:30 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-16 08:43:30 -0800 |
| commit | eeae4da6ad38b14409f8c5bdf14e423af5f22a51 (patch) | |
| tree | e84c97063afab35c1092d730a97378212611f5ca | |
| parent | c53f6ca51b15b79dc785b45db8fa7cb1b85b05f3 (diff) | |
| parent | 9aad20f18450991c002b42eb83100e9da7d21dd9 (diff) | |
| download | rails-eeae4da6ad38b14409f8c5bdf14e423af5f22a51.tar.gz rails-eeae4da6ad38b14409f8c5bdf14e423af5f22a51.tar.bz2 rails-eeae4da6ad38b14409f8c5bdf14e423af5f22a51.zip | |
Merge pull request #5059 from waseem/autoload_effectively
Autoload various constants effectively in abstract connection adapter.
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index dd421b2054..07c2bc44d9 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -13,21 +13,24 @@ module ActiveRecord autoload :Column autoload :ConnectionSpecification - autoload_under 'abstract' do - autoload :IndexDefinition, 'active_record/connection_adapters/abstract/schema_definitions' - autoload :ColumnDefinition, 'active_record/connection_adapters/abstract/schema_definitions' - autoload :TableDefinition, 'active_record/connection_adapters/abstract/schema_definitions' - autoload :Table, 'active_record/connection_adapters/abstract/schema_definitions' + autoload_at 'active_record/connection_adapters/abstract/schema_definitions' do + autoload :IndexDefinition + autoload :ColumnDefinition + autoload :TableDefinition + autoload :Table + end + + autoload_at 'active_record/connection_adapters/abstract/connection_pool' do + autoload :ConnectionHandler + autoload :ConnectionManagement + end + autoload_under 'abstract' do autoload :SchemaStatements autoload :DatabaseStatements autoload :DatabaseLimits autoload :Quoting - autoload :ConnectionPool - autoload :ConnectionHandler, 'active_record/connection_adapters/abstract/connection_pool' - autoload :ConnectionManagement, 'active_record/connection_adapters/abstract/connection_pool' - autoload :QueryCache end |