Skip to content

Commit 95f12e0

Browse files
michaelrigartmetaskills
authored andcommitted
Bugfix: Use ActiveSupport.on_load to hook into ActiveRecord (#598)
* Use `ActiveSupport.on_load` to hook into ActiveRecord #588
1 parent e2c3c5f commit 95f12e0

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ def execute_procedure(proc_name, *variables)
2424
end
2525
end
2626

27-
ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
27+
ActiveSupport.on_load(:active_record) do
28+
include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
29+
end

lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ def attributes_for_update(attribute_names)
2222
end
2323
end
2424

25-
ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
25+
ActiveSupport.on_load(:active_record) do
26+
include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
27+
end

lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ def unprepare_sqlserver_statement(sql)
4343
end
4444
end
4545

46-
ActiveRecord::Base.extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
47-
ActiveRecord::Relation.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
46+
ActiveSupport.on_load(:active_record) do
47+
extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
48+
ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain)
49+
end
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
silence_warnings do
2-
# Already defined in Rails
3-
ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
1+
ActiveSupport.on_load(:active_record) do
2+
silence_warnings do
3+
# Already defined in Rails
4+
ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
5+
end
46
end

0 commit comments

Comments
 (0)