Merge pull request #7224 from kennyj/move_to_ar

The use_schema_cache_dump configuration moved to ActiveRecord.

2 files changed, 22 insertions, 17 deletions

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 9432a70c41..672d9a4246 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -29,6 +29,8 @@ module ActiveRecord
       'ActiveRecord::RecordNotSaved'   => :unprocessable_entity
     )
 
+    config.active_record.use_schema_cache_dump = true
+
     rake_tasks do
       require "active_record/base"
       load "active_record/railties/databases.rake"
@@ -66,6 +68,25 @@ module ActiveRecord
       end
     end
 
+    initializer "active_record.check_schema_cache_dump" do |app|
+      if config.active_record.delete(:use_schema_cache_dump)
+        config.after_initialize do |app|
+          ActiveSupport.on_load(:active_record) do
+            filename = File.join(app.config.paths["db"].first, "schema_cache.dump")
+    
+            if File.file?(filename)
+              cache = Marshal.load File.binread filename
+              if cache.version == ActiveRecord::Migrator.current_version
+                ActiveRecord::Model.connection.schema_cache = cache
+              else
+                warn "schema_cache.dump is expired. Current version is #{ActiveRecord::Migrator.current_version}, but cache version is #{cache.version}."
+              end
+            end
+          end
+        end
+      end
+    end
+
     initializer "active_record.set_configs" do |app|
       ActiveSupport.on_load(:active_record) do
         app.config.active_record.each do |k,v|
@@ -117,21 +138,6 @@ module ActiveRecord
         end
       end
 
-      ActiveSupport.on_load(:active_record) do
-        if app.config.use_schema_cache_dump
-          filename = File.join(app.config.paths["db"].first, "schema_cache.dump")
-
-          if File.file?(filename)
-            cache = Marshal.load File.binread filename
-            if cache.version == ActiveRecord::Migrator.current_version
-              ActiveRecord::Model.connection.schema_cache = cache
-            else
-              warn "schema_cache.dump is expired. Current version is #{ActiveRecord::Migrator.current_version}, but cache version is #{cache.version}."
-            end
-          end
-        end
-      end
-
     end
   end
 end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a2e5dece16..9521805778 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -11,7 +11,7 @@ module Rails
                     :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
                     :preload_frameworks, :railties_order, :relative_url_root, :secret_token,
                     :serve_static_assets, :ssl_options, :static_cache_control, :session_options,
-                    :time_zone, :reload_classes_only_on_change, :use_schema_cache_dump,
+                    :time_zone, :reload_classes_only_on_change,
                     :queue, :queue_consumer
 
       attr_writer :log_level
@@ -43,7 +43,6 @@ module Rails
         @exceptions_app                = nil
         @autoflush_log                 = true
         @log_formatter                 = ActiveSupport::Logger::SimpleFormatter.new
-        @use_schema_cache_dump         = true
         @queue                         = Rails::Queueing::Queue
         @queue_consumer                = Rails::Queueing::ThreadedConsumer