1 files changed, 6 insertions, 33 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 46235ab922..246d330b76 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -265,19 +265,16 @@ db_namespace = namespace :db do
     end
 
     namespace :cache do
-      desc "Creates a db/schema_cache.dump file."
+      desc "Creates a db/schema_cache.yml file."
       task dump: [:environment, :load_config] do
-        con = ActiveRecord::Base.connection
-        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.dump")
-
-        con.schema_cache.clear!
-        con.data_sources.each { |table| con.schema_cache.add(table) }
-        open(filename, "wb") { |f| f.write(Marshal.dump(con.schema_cache)) }
+        conn = ActiveRecord::Base.connection
+        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.yml")
+        ActiveRecord::Tasks::DatabaseTasks.dump_schema_cache(conn, filename)
       end
 
-      desc "Clears a db/schema_cache.dump file."
+      desc "Clears a db/schema_cache.yml file."
       task clear: [:environment, :load_config] do
-        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.dump")
+        filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "schema_cache.yml")
         rm_f filename, verbose: false
       end
     end
@@ -312,14 +309,6 @@ db_namespace = namespace :db do
   end
 
   namespace :test do
-
-    task :deprecated do
-      Rake.application.top_level_tasks.grep(/^db:test:/).each do |task|
-        $stderr.puts "WARNING: #{task} is deprecated. The Rails test helper now maintains " \
-                     "your test schema automatically, see the release notes for details."
-      end
-    end
-
     # desc "Recreate the test database from the current schema"
     task load: %w(db:test:purge) do
       case ActiveRecord::Base.schema_format
@@ -348,22 +337,6 @@ db_namespace = namespace :db do
       ActiveRecord::Tasks::DatabaseTasks.load_schema ActiveRecord::Base.configurations["test"], :sql, ENV["SCHEMA"]
     end
 
-    # desc "Recreate the test database from a fresh schema"
-    task clone: %w(db:test:deprecated environment) do
-      case ActiveRecord::Base.schema_format
-      when :ruby
-        db_namespace["test:clone_schema"].invoke
-      when :sql
-        db_namespace["test:clone_structure"].invoke
-      end
-    end
-
-    # desc "Recreate the test database from a fresh schema.rb file"
-    task clone_schema: %w(db:test:deprecated db:schema:dump db:test:load_schema)
-
-    # desc "Recreate the test database from a fresh structure.sql file"
-    task clone_structure: %w(db:test:deprecated db:structure:dump db:test:load_structure)
-
     # desc "Empty the test database"
     task purge: %w(environment load_config check_protected_environments) do
       ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations["test"]