1 files changed, 9 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/rails.rb
index e7de699974..a13bd2a5da 100644
--- a/activerecord/lib/active_record/rails.rb
+++ b/activerecord/lib/active_record/rails.rb
@@ -7,12 +7,9 @@ require "action_controller/rails"
 module ActiveRecord
   class Plugin < Rails::Plugin
     plugin_name :active_record
-    include_modules_in "ActiveRecord::Base"
-
-    config.action_controller.include "ActiveRecord::ControllerRuntime"
 
     rake_tasks do
-      load "active_record/rails/databases.rake"
+      load "active_record/railties/databases.rake"
     end
 
     initializer "active_record.set_configs" do |app|
@@ -33,6 +30,12 @@ module ActiveRecord
       ActiveRecord::Base.default_timezone = :utc
     end
 
+    # Expose database runtime to controller for logging.
+    initializer "active_record.log_runtime" do |app|
+      require "active_record/railties/controller_runtime"
+      ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
+    end
+
     # Setup database middleware after initializers have run
     initializer "active_record.initialize_database_middleware" do |app|
       middleware = app.config.middleware
@@ -51,7 +54,7 @@ module ActiveRecord
 
     # TODO: ActiveRecord::Base.logger should delegate to its own config.logger
     initializer "active_record.logger" do
-      ActiveRecord::Base.logger ||= Rails.logger
+      ActiveRecord::Base.logger ||= ::Rails.logger
     end
 
     initializer "active_record.notifications" do
@@ -63,4 +66,4 @@ module ActiveRecord
     end
 
   end
-end
-\ No newline at end of file
+end