diff options
| -rw-r--r-- | activerecord/lib/active_record.rb | 3 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 612e2313ae..3293206d43 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -37,6 +37,9 @@ module ActiveRecord [Base, DynamicFinderMatch, ConnectionAdapters::AbstractAdapter] end + autoload :ActiveRecordError, 'active_record/base' + autoload :ConnectionNotEstablished, 'active_record/base' + autoload :Aggregations, 'active_record/aggregations' autoload :AssociationPreload, 'active_record/association_preload' autoload :Associations, 'active_record/associations' diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 1e7cac8371..9e4514375f 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2990,3 +2990,6 @@ module ActiveRecord #:nodoc: include Aggregations, Transactions, Reflection, Calculations, Serialization end end + +# TODO: Remove this and make it work with LAZY flag +require 'active_record/connection_adapters/abstract_adapter' |