Skip to content

Commit 5c663be

Browse files
committed
Restore reverted lazy-loaded AR
This reverts commit c54cb7c.
1 parent 4911437 commit 5c663be

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

ruby_event_store-active_record/lib/ruby_event_store/active_record.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
require_relative "active_record/index_violation_detector"
1616
require_relative "active_record/pg_linearized_event_repository"
1717
require_relative "active_record/version"
18-
require_relative "active_record/skip_json_serialization"
19-
require_relative "active_record/event"
20-
require_relative "active_record/railtie" if defined?(Rails::Engine)
18+
if defined?(Rails::Engine)
19+
require_relative "active_record/railtie"
20+
else
21+
require_relative "active_record/skip_json_serialization"
22+
require_relative "active_record/event"
23+
end

ruby_event_store-active_record/lib/ruby_event_store/active_record/railtie.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
module RubyEventStore
44
module ActiveRecord
55
class Railtie < ::Rails::Railtie
6+
initializer "ruby_event_store-active_record" do
7+
ActiveSupport.on_load(:active_record) do
8+
require_relative "../active_record/skip_json_serialization"
9+
require_relative "../active_record/event"
10+
end
11+
end
612
end
713
end
814
end

0 commit comments

Comments
 (0)