Merge pull request rails#143 from Edouard-chin/ec-fix-lazy-hook-backw…

…ard-compatibility Fix backward compatibility issue introduced by rails#126
bebanjo · Apr 12, 2021 · 9f666a0 · 9f666a0
1 parent 9adb070
commit 9f666a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/active_record/session_store.rb b/lib/active_record/session_store.rb
@@ -7,6 +7,8 @@
 
 module ActiveRecord
   module SessionStore
+    autoload :Session, 'active_record/session_store/session'
+
     module ClassMethods # :nodoc:
       mattr_accessor :serializer
 
@@ -111,7 +113,6 @@ def self.dump(value)
 
 ActiveSupport.on_load(:active_record) do
   require 'active_record/session_store/session'
-  ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session
 end
 
 require 'active_record/session_store/sql_bypass'

diff --git a/lib/active_record/session_store/session.rb b/lib/active_record/session_store/session.rb
@@ -103,3 +103,5 @@ def raise_on_session_data_overflow!
     end
   end
 end
+
+ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,3 +103,5 @@ def raise_on_session_data_overflow! @@
         end
       end
     end
+    ActionDispatch::Session::ActiveRecordStore.session_class = ActiveRecord::SessionStore::Session