adding a test class for table renaming

3 files changed, 78 insertions, 70 deletions

diff --git a/activerecord/test/cases/migration/helper.rb b/activerecord/test/cases/migration/helper.rb
index e63bcb17fe..1a5ac1333e 100644
--- a/activerecord/test/cases/migration/helper.rb
+++ b/activerecord/test/cases/migration/helper.rb
@@ -21,6 +21,8 @@ module ActiveRecord
 
       def teardown
         super
+        TestModel.reset_table_name
+        TestModel.reset_sequence_name
         connection.drop_table :test_models rescue nil
       end
 
@@ -44,6 +46,10 @@ module ActiveRecord
       def change_column(*args)
         connection.change_column(*args)
       end
+
+      def rename_table(*args)
+        connection.rename_table(*args)
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration/rename_table_test.rb b/activerecord/test/cases/migration/rename_table_test.rb
new file mode 100644
index 0000000000..478aca011c
--- /dev/null
+++ b/activerecord/test/cases/migration/rename_table_test.rb
@@ -0,0 +1,72 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class RenameColumnTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      def setup
+        super
+        add_column 'test_models', :url, :string
+        remove_column 'test_models', :created_at
+        remove_column 'test_models', :updated_at
+      end
+
+      def test_rename_table_for_sqlite_should_work_with_reserved_words
+        renamed = false
+
+        skip "not supported" unless current_adapter?(:SQLite3Adapter)
+
+        add_column :test_models, :url, :string
+        connection.rename_table :references, :old_references
+        connection.rename_table :test_models, :references
+
+        renamed = true
+
+        # Using explicit id in insert for compatibility across all databases
+        con = connection
+        con.execute "INSERT INTO 'references' (url, created_at, updated_at) VALUES ('http://rubyonrails.com', 0, 0)"
+        assert_equal 'http://rubyonrails.com', connection.select_value("SELECT url FROM 'references' WHERE id=1")
+      ensure
+        return unless renamed
+        connection.rename_table :references, :test_models
+        connection.rename_table :old_references, :references
+      end
+
+      def test_rename_table
+        rename_table :test_models, :octopi
+
+        # Using explicit id in insert for compatibility across all databases
+        con = connection
+        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+
+        con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')"
+
+        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+
+        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', connection.select_value("SELECT url FROM octopi WHERE id=1")
+
+        rename_table :octopi, :test_models
+      end
+
+      def test_rename_table_with_an_index
+        add_index :test_models, :url
+
+        rename_table :test_models, :octopi
+
+        # Using explicit id in insert for compatibility across all databases
+        con = ActiveRecord::Base.connection
+        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+        con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')"
+        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+
+        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', connection.select_value("SELECT url FROM octopi WHERE id=1")
+        assert connection.indexes(:octopi).first.columns.include?("url")
+
+        rename_table :octopi, :test_models
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 2dbed450b6..2573c77405 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -95,76 +95,6 @@ class MigrationTest < ActiveRecord::TestCase
     assert_raise(ArgumentError) { Person.connection.remove_column("funny") }
   end
 
-  def test_rename_table_for_sqlite_should_work_with_reserved_words
-    skip "not supported" unless current_adapter?(:SQLite3Adapter)
-
-    begin
-      assert_nothing_raised do
-        ActiveRecord::Base.connection.rename_table :references, :old_references
-        ActiveRecord::Base.connection.create_table :octopuses do |t|
-          t.column :url, :string
-        end
-      end
-
-      assert_nothing_raised { ActiveRecord::Base.connection.rename_table :octopuses, :references }
-
-      # Using explicit id in insert for compatibility across all databases
-      con = ActiveRecord::Base.connection
-      assert_nothing_raised do
-        con.execute "INSERT INTO 'references' (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://rubyonrails.com')"
-      end
-      assert_equal 'http://rubyonrails.com', ActiveRecord::Base.connection.select_value("SELECT url FROM 'references' WHERE id=1")
-
-    ensure
-      ActiveRecord::Base.connection.drop_table :references
-      ActiveRecord::Base.connection.rename_table :old_references, :references
-    end
-  end
-
-  def test_rename_table
-    begin
-      ActiveRecord::Base.connection.create_table :octopuses do |t|
-        t.column :url, :string
-      end
-      ActiveRecord::Base.connection.rename_table :octopuses, :octopi
-
-      # Using explicit id in insert for compatibility across all databases
-      con = ActiveRecord::Base.connection
-      con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
-      assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
-      con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
-
-      assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
-
-    ensure
-      ActiveRecord::Base.connection.drop_table :octopuses rescue nil
-      ActiveRecord::Base.connection.drop_table :octopi rescue nil
-    end
-  end
-
-  def test_rename_table_with_an_index
-    begin
-      ActiveRecord::Base.connection.create_table :octopuses do |t|
-        t.column :url, :string
-      end
-      ActiveRecord::Base.connection.add_index :octopuses, :url
-
-      ActiveRecord::Base.connection.rename_table :octopuses, :octopi
-
-      # Using explicit id in insert for compatibility across all databases
-      con = ActiveRecord::Base.connection
-      con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
-      assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
-      con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
-
-      assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
-      assert ActiveRecord::Base.connection.indexes(:octopi).first.columns.include?("url")
-    ensure
-      ActiveRecord::Base.connection.drop_table :octopuses rescue nil
-      ActiveRecord::Base.connection.drop_table :octopi rescue nil
-    end
-  end
-
   def test_add_table
     assert !Reminder.table_exists?