Skip to content

Commit 9f0ec6a

Browse files
committed
Use lazy-load hook:
- When requiring `active_record/session_store/session`, it will load the `ActiveRecord::Base` [class](https://github.com/rails/activerecord-session_store/blob/a170dd4016208b9ce45cb77f2d946d2d7ef8064e/lib/active_record/session_store/session.rb#L7) which triggers all lazy load hooks at the wrong time
1 parent b5e7da2 commit 9f0ec6a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/active_record/session_store.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,14 @@ def self.dump(value)
108108
end
109109
end
110110

111-
require 'active_record/session_store/session'
111+
ActiveSupport.on_load(:active_record) do
112+
require 'active_record/session_store/session'
113+
ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session
114+
end
115+
112116
require 'active_record/session_store/sql_bypass'
113117
require 'active_record/session_store/railtie' if defined?(Rails)
114118

115-
ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session
116119
Logger.send :include, ActiveRecord::SessionStore::Extension::LoggerSilencer
117120

118121
begin

0 commit comments

Comments
 (0)