1 files changed, 59 insertions, 23 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e99312c245..931caff727 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -177,20 +177,18 @@ class MigrationTest < ActiveRecord::TestCase
   end
 
   def test_filtering_migrations
-    assert !Person.column_methods_hash.include?(:last_name)
+    assert_no_column Person, :last_name
     assert !Reminder.table_exists?
 
     name_filter = lambda { |migration| migration.name == "ValidPeopleHaveLastNames" }
     ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", &name_filter)
 
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
+    assert_column Person, :last_name
     assert_raise(ActiveRecord::StatementInvalid) { Reminder.first }
 
     ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", &name_filter)
 
-    Person.reset_column_information
-    assert !Person.column_methods_hash.include?(:last_name)
+    assert_no_column Person, :last_name
     assert_raise(ActiveRecord::StatementInvalid) { Reminder.first }
   end
 
@@ -237,7 +235,7 @@ class MigrationTest < ActiveRecord::TestCase
       skip "not supported on #{ActiveRecord::Base.connection.class}"
     end
 
-    assert_not Person.column_methods_hash.include?(:last_name)
+    assert_no_column Person, :last_name
 
     migration = Class.new(ActiveRecord::Migration) {
       def version; 100 end
@@ -253,8 +251,7 @@ class MigrationTest < ActiveRecord::TestCase
 
     assert_equal "An error has occurred, this and all later migrations canceled:\n\nSomething broke", e.message
 
-    Person.reset_column_information
-    assert_not Person.column_methods_hash.include?(:last_name),
+    assert_no_column Person, :last_name,
      "On error, the Migrator should revert schema changes but it did not."
   end
 
@@ -263,7 +260,7 @@ class MigrationTest < ActiveRecord::TestCase
       skip "not supported on #{ActiveRecord::Base.connection.class}"
     end
 
-    assert_not Person.column_methods_hash.include?(:last_name)
+    assert_no_column Person, :last_name
 
     migration = Class.new(ActiveRecord::Migration) {
       def version; 100 end
@@ -279,8 +276,7 @@ class MigrationTest < ActiveRecord::TestCase
 
     assert_equal "An error has occurred, this migration was canceled:\n\nSomething broke", e.message
 
-    Person.reset_column_information
-    assert_not Person.column_methods_hash.include?(:last_name),
+    assert_no_column Person, :last_name,
       "On error, the Migrator should revert schema changes but it did not."
   end
 
@@ -289,7 +285,7 @@ class MigrationTest < ActiveRecord::TestCase
       skip "not supported on #{ActiveRecord::Base.connection.class}"
     end
 
-    assert_not Person.column_methods_hash.include?(:last_name)
+    assert_no_column Person, :last_name
 
     migration = Class.new(ActiveRecord::Migration) {
       self.disable_ddl_transaction!
@@ -305,12 +301,11 @@ class MigrationTest < ActiveRecord::TestCase
     e = assert_raise(StandardError) { migrator.migrate }
     assert_equal "An error has occurred, all later migrations canceled:\n\nSomething broke", e.message
 
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name),
+    assert_column Person, :last_name,
      "without ddl transactions, the Migrator should not rollback on error but it did."
   ensure
     Person.reset_column_information
-    if Person.column_methods_hash.include?(:last_name)
+    if Person.column_names.include?('last_name')
       Person.connection.remove_column('people', 'last_name')
     end
   end
@@ -326,12 +321,53 @@ class MigrationTest < ActiveRecord::TestCase
     assert_equal "schema_migrations", ActiveRecord::Migrator.schema_migrations_table_name
   end
 
-  def test_proper_table_name
-    assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
-    assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
-    assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
+  def test_proper_table_name_on_migrator
+    assert_deprecated do
+      assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
+    end
+    assert_deprecated do
+      assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
+    end
+    assert_deprecated do
+      assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
+    end
+    Reminder.reset_table_name
+    assert_deprecated do
+      assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
+    end
+
+    # Use the model's own prefix/suffix if a model is given
+    ActiveRecord::Base.table_name_prefix = "ARprefix_"
+    ActiveRecord::Base.table_name_suffix = "_ARsuffix"
+    Reminder.table_name_prefix = 'prefix_'
+    Reminder.table_name_suffix = '_suffix'
+    Reminder.reset_table_name
+    assert_deprecated do
+      assert_equal "prefix_reminders_suffix", ActiveRecord::Migrator.proper_table_name(Reminder)
+    end
+    Reminder.table_name_prefix = ''
+    Reminder.table_name_suffix = ''
+    Reminder.reset_table_name
+
+    # Use AR::Base's prefix/suffix if string or symbol is given
+    ActiveRecord::Base.table_name_prefix = "prefix_"
+    ActiveRecord::Base.table_name_suffix = "_suffix"
+    Reminder.reset_table_name
+    assert_deprecated do
+      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name('table')
+    end
+    assert_deprecated do
+      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name(:table)
+    end
+  end
+
+  def test_proper_table_name_on_migration
+    migration = ActiveRecord::Migration.new
+    assert_equal "table", migration.proper_table_name('table')
+    assert_equal "table", migration.proper_table_name(:table)
+    assert_equal "reminders", migration.proper_table_name(Reminder)
     Reminder.reset_table_name
-    assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
+    assert_equal Reminder.table_name, migration.proper_table_name(Reminder)
 
     # Use the model's own prefix/suffix if a model is given
     ActiveRecord::Base.table_name_prefix = "ARprefix_"
@@ -339,7 +375,7 @@ class MigrationTest < ActiveRecord::TestCase
     Reminder.table_name_prefix = 'prefix_'
     Reminder.table_name_suffix = '_suffix'
     Reminder.reset_table_name
-    assert_equal "prefix_reminders_suffix", ActiveRecord::Migrator.proper_table_name(Reminder)
+    assert_equal "prefix_reminders_suffix", migration.proper_table_name(Reminder)
     Reminder.table_name_prefix = ''
     Reminder.table_name_suffix = ''
     Reminder.reset_table_name
@@ -348,8 +384,8 @@ class MigrationTest < ActiveRecord::TestCase
     ActiveRecord::Base.table_name_prefix = "prefix_"
     ActiveRecord::Base.table_name_suffix = "_suffix"
     Reminder.reset_table_name
-    assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name('table')
-    assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name(:table)
+    assert_equal "prefix_table_suffix", migration.proper_table_name('table', migration.table_name_options)
+    assert_equal "prefix_table_suffix", migration.proper_table_name(:table, migration.table_name_options)
   end
 
   def test_rename_table_with_prefix_and_suffix