From 87928c9298111818c9dd42e8c7faebfc8ae41c0b Mon Sep 17 00:00:00 2001 From: Pat Allan Date: Wed, 24 Dec 2014 00:30:51 +1100 Subject: [PATCH] Switch from ActiveSupport's on_load to railtie initializer. This resolves the insistent warning about errors in transactions, covered in #867. --- lib/thinking_sphinx/railtie.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/thinking_sphinx/railtie.rb b/lib/thinking_sphinx/railtie.rb index ab77e7e78..1d8a17aa8 100644 --- a/lib/thinking_sphinx/railtie.rb +++ b/lib/thinking_sphinx/railtie.rb @@ -1,6 +1,8 @@ class ThinkingSphinx::Railtie < Rails::Railtie - ActiveSupport.on_load :active_record do - include ThinkingSphinx::ActiveRecord::Base + initializer 'thinking_sphinx.initialisation' do + if defined?(ActiveRecord::Base) + ActiveRecord::Base.send :include, ThinkingSphinx::ActiveRecord::Base + end end rake_tasks do