aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-24 12:09:49 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-24 12:17:07 -0600
commitd6b923adbdfc9a4df20132f741bbfb43db12113c (patch)
tree3f2f3f447675882eedb8ff0ac25c7c7396d5ebf8 /activerecord/lib
parent21901e9345daff5abb3acb0af108f5f2134bee32 (diff)
downloadrails-d6b923adbdfc9a4df20132f741bbfb43db12113c.tar.gz
rails-d6b923adbdfc9a4df20132f741bbfb43db12113c.tar.bz2
rails-d6b923adbdfc9a4df20132f741bbfb43db12113c.zip
get activerecord tests passing with lazy loading
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record.rb3
-rwxr-xr-xactiverecord/lib/active_record/base.rb3
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'