Merge

2 files changed, 59 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/notifications.rb b/activerecord/lib/active_record/notifications.rb
deleted file mode 100644
index 562a5b91f4..0000000000
--- a/activerecord/lib/active_record/notifications.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'active_support/notifications'
-
-ActiveSupport::Notifications.subscribe("sql") do |name, before, after, result, instrumenter_id, payload|
-  ActiveRecord::Base.connection.log_info(payload[:sql], name, after - before)
-end
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/rails.rb
new file mode 100644
index 0000000000..ddbc555113
--- /dev/null
+++ b/activerecord/lib/active_record/rails.rb
@@ -0,0 +1,59 @@
+# For now, action_controller must always be present with
+# rails, so let's make sure that it gets required before
+# here. This is needed for correctly setting up the middleware.
+# In the future, this might become an optional require.
+require "action_controller/rails"
+
+module ActiveRecord
+  class Plugin < Rails::Plugin
+    plugin_name :active_record
+
+    initializer "active_record.set_configs" do |app|
+      app.config.active_record.each do |k,v|
+        ActiveRecord::Base.send "#{k}=", v
+      end
+    end
+
+    # This sets the database configuration from Configuration#database_configuration
+    # and then establishes the connection.
+    initializer "active_record.initialize_database" do |app|
+      ActiveRecord::Base.configurations = app.config.database_configuration
+      ActiveRecord::Base.establish_connection
+    end
+
+    initializer "active_record.initialize_timezone" do
+      ActiveRecord::Base.time_zone_aware_attributes = true
+      ActiveRecord::Base.default_timezone = :utc
+    end
+
+    # Setup database middleware after initializers have run
+    initializer "active_record.initialize_database_middleware" do |app|
+      middleware = app.config.middleware
+      if middleware.include?(ActiveRecord::SessionStore)
+        middleware.insert_before ActiveRecord::SessionStore, ActiveRecord::ConnectionAdapters::ConnectionManagement
+        middleware.insert_before ActiveRecord::SessionStore, ActiveRecord::QueryCache
+      else
+        middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+        middleware.use ActiveRecord::QueryCache
+      end
+    end
+
+    initializer "active_record.load_observers" do
+      ActiveRecord::Base.instantiate_observers
+    end
+
+    # TODO: ActiveRecord::Base.logger should delegate to its own config.logger
+    initializer "active_record.logger" do
+      ActiveRecord::Base.logger ||= Rails.logger
+    end
+
+    initializer "active_record.notifications" do
+      require 'active_support/notifications'
+
+      ActiveSupport::Notifications.subscribe("sql") do |name, before, after, result, instrumenter_id, payload|
+        ActiveRecord::Base.connection.log_info(payload[:sql], name, after - before)
+      end
+    end
+
+  end
+end
\ No newline at end of file