Permalink
Browse files

removes the AR session store from eager loaded code [fixes #7160]

See the comment in the file activerecord/lib/active_record.rb
added by this patch for the rationale.
  • Loading branch information...
1 parent be408d6 commit cc712f2072e2bfd16db83239dd163eb3a488c45e @fxn fxn committed Jul 28, 2012
Showing with 10 additions and 1 deletion.
  1. +10 −1 activerecord/lib/active_record.rb
@@ -31,6 +31,16 @@
module ActiveRecord
extend ActiveSupport::Autoload
+ # ActiveRecord::SessionStore depends on the abstract store in Action Pack.
+ # Eager loading this class would break client code that eager loads Active
+ # Record standalone.
+ #
+ # Note that the Rails application generator creates an initializer specific
+ # for setting the session store. Thus, albeit in theory this autoload would
+ # not be thread-safe, in practice it is because if the application uses this
+ # session store its autoload happens at boot time.
+ autoload :SessionStore
+
eager_autoload do
autoload :ActiveRecordError, 'active_record/errors'
autoload :ConnectionNotEstablished, 'active_record/errors'
@@ -81,7 +91,6 @@ module ActiveRecord
autoload :SchemaDumper
autoload :Scoping
autoload :Serialization
- autoload :SessionStore
autoload :Store
autoload :Timestamp
autoload :Transactions

0 comments on commit cc712f2

Please sign in to comment.