From 4b7ac2e83eb5776855b4abe02ca6060e73290e42 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Wed, 20 Aug 2014 14:26:22 +0900 Subject: Drop schema_migrations table only when exists --- activerecord/test/cases/migration_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/test/cases/migration_test.rb') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index f9d1edc340..034a0f567e 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -89,7 +89,7 @@ class MigrationTest < ActiveRecord::TestCase end def test_migration_detection_without_schema_migration_table - ActiveRecord::Base.connection.drop_table :schema_migrations + ActiveRecord::Base.connection.drop_table('schema_migrations') if ActiveRecord::Base.connection.table_exists?('schema_migrations') migrations_path = MIGRATIONS_ROOT + "/valid" old_path = ActiveRecord::Migrator.migrations_paths -- cgit v1.2.3 From fb7eecad3074c83711ee93d45844f927bb9df731 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 29 Aug 2014 09:27:26 +0900 Subject: Reset ActiveRecord::Migration.verbose to the value before --- activerecord/test/cases/migration_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/test/cases/migration_test.rb') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 034a0f567e..0fed0a862f 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -34,7 +34,7 @@ class MigrationTest < ActiveRecord::TestCase Reminder.connection.drop_table(table) rescue nil end Reminder.reset_column_information - ActiveRecord::Migration.verbose = true + @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, true ActiveRecord::Migration.message_count = 0 ActiveRecord::Base.connection.schema_cache.clear! end @@ -65,6 +65,8 @@ class MigrationTest < ActiveRecord::TestCase Person.connection.remove_column("people", "middle_name") rescue nil Person.connection.add_column("people", "first_name", :string) Person.reset_column_information + + ActiveRecord::Migration.verbose = @verbose_was end def test_migrator_versions -- cgit v1.2.3 From aefb66779559efb6a7c6688777e664a34678de32 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 29 Aug 2014 09:38:15 +0900 Subject: No tests are dealing with ActiveRecord::Migration.message_count here anymore --- activerecord/test/cases/migration_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'activerecord/test/cases/migration_test.rb') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 0fed0a862f..a67a6403e4 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -35,7 +35,6 @@ class MigrationTest < ActiveRecord::TestCase end Reminder.reset_column_information @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, true - ActiveRecord::Migration.message_count = 0 ActiveRecord::Base.connection.schema_cache.clear! end -- cgit v1.2.3 From 9c76381356b2671009abf9523b955c6a847aa125 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 29 Aug 2014 10:06:05 +0900 Subject: MigrationTest doesn't need to be verbose anymore --- activerecord/test/cases/migration_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/test/cases/migration_test.rb') diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index a67a6403e4..633077622c 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -34,7 +34,7 @@ class MigrationTest < ActiveRecord::TestCase Reminder.connection.drop_table(table) rescue nil end Reminder.reset_column_information - @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, true + @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, false ActiveRecord::Base.connection.schema_cache.clear! end -- cgit v1.2.3