Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format"

This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing
changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586.

Conflicts:
	activerecord/CHANGELOG.md

4 files changed, 3 insertions, 105 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7e40373163..462c7ae115 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -128,14 +128,7 @@
     Serialized attributes on ActiveRecord models will no longer save when
     unchanged. Fixes #8328.
 
-    Sean Griffin
-
-*   Fixed automatic maintaining test schema to properly handle sql structure
-    schema format.
-
-    Fixes #15394.
-
-    *Wojciech Wnętrzak*
+    *Sean Griffin*
 
 *   Pluck now works when selecting columns from different tables with the same
     name.
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index 4727469420..9bc23b5ec7 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -176,12 +176,10 @@ module ActiveRecord
         when :ruby
           file ||= File.join(db_dir, "schema.rb")
           check_schema_file(file)
-          purge(current_config)
           load(file)
         when :sql
           file ||= File.join(db_dir, "structure.sql")
           check_schema_file(file)
-          purge(current_config)
           structure_load(current_config, file)
         else
           raise ArgumentError, "unknown format #{format.inspect}"
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
index 9ab64d0325..5688931db2 100644
--- a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
@@ -21,11 +21,7 @@ module ActiveRecord
 
         FileUtils.rm(file) if File.exist?(file)
       end
-
-      def purge
-        drop
-        create
-      end
+      alias :purge :drop
 
       def charset
         connection.encoding
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index c724c867ec..a223180169 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -67,7 +67,7 @@ module ApplicationTests
       assert_match %r{/app/test/unit/failing_test\.rb}, output
     end
 
-    test "ruby schema migrations" do
+    test "migrations" do
       output  = script('generate model user name:string')
       version = output.match(/(\d+)_create_users\.rb/)[1]
 
@@ -104,95 +104,6 @@ module ApplicationTests
       assert !result.include?("create_table(:users)")
     end
 
-    test "sql structure migrations" do
-      output  = script('generate model user name:string')
-      version = output.match(/(\d+)_create_users\.rb/)[1]
-
-      app_file 'test/models/user_test.rb', <<-RUBY
-        require 'test_helper'
-
-        class UserTest < ActiveSupport::TestCase
-          test "user" do
-            User.create! name: "Jon"
-          end
-        end
-      RUBY
-
-      app_file 'db/structure.sql', ''
-      app_file 'config/initializers/enable_sql_schema_format.rb', <<-RUBY
-        Rails.application.config.active_record.schema_format = :sql
-      RUBY
-
-      assert_unsuccessful_run "models/user_test.rb", "Migrations are pending"
-
-      app_file 'db/structure.sql', <<-SQL
-        CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
-        CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
-        CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
-        INSERT INTO schema_migrations (version) VALUES ('#{version}');
-      SQL
-
-      app_file 'config/initializers/disable_maintain_test_schema.rb', <<-RUBY
-        Rails.application.config.active_record.maintain_test_schema = false
-      RUBY
-
-      assert_unsuccessful_run "models/user_test.rb", "Could not find table 'users'"
-
-      File.delete "#{app_path}/config/initializers/disable_maintain_test_schema.rb"
-
-      assert_successful_test_run('models/user_test.rb')
-    end
-
-    test "sql structure migrations when adding column to existing table" do
-      output_1  = script('generate model user name:string')
-      version_1 = output_1.match(/(\d+)_create_users\.rb/)[1]
-
-      app_file 'test/models/user_test.rb', <<-RUBY
-        require 'test_helper'
-        class UserTest < ActiveSupport::TestCase
-          test "user" do
-            User.create! name: "Jon"
-          end
-        end
-      RUBY
-
-      app_file 'config/initializers/enable_sql_schema_format.rb', <<-RUBY
-        Rails.application.config.active_record.schema_format = :sql
-      RUBY
-
-      app_file 'db/structure.sql', <<-SQL
-        CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
-        CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
-        CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
-        INSERT INTO schema_migrations (version) VALUES ('#{version_1}');
-      SQL
-
-      assert_successful_test_run('models/user_test.rb')
-
-      output_2  = script('generate migration add_email_to_users')
-      version_2 = output_2.match(/(\d+)_add_email_to_users\.rb/)[1]
-
-      app_file 'test/models/user_test.rb', <<-RUBY
-        require 'test_helper'
-
-        class UserTest < ActiveSupport::TestCase
-          test "user" do
-            User.create! name: "Jon", email: "jon@doe.com"
-          end
-        end
-      RUBY
-
-      app_file 'db/structure.sql', <<-SQL
-        CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
-        CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
-        CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "email" varchar(255));
-        INSERT INTO schema_migrations (version) VALUES ('#{version_1}');
-        INSERT INTO schema_migrations (version) VALUES ('#{version_2}');
-      SQL
-
-      assert_successful_test_run('models/user_test.rb')
-    end
-
     private
       def assert_unsuccessful_run(name, message)
         result = run_test_file(name)