move more schema modification tests

2 files changed, 70 insertions, 63 deletions

diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index f8eedc712f..c877f3dd95 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -355,6 +355,76 @@ module ActiveRecord
         end
       end
 
+      def test_add_index
+        # Limit size of last_name and key columns to support Firebird index limitations
+        connection.create_table :testings do |t|
+          t.string :first_name
+          t.string :last_name, :limit => 100
+          t.string :key,       :limit => 100
+          t.boolean :administrator
+        end
+
+        connection.add_index("testings", "last_name")
+        connection.remove_index("testings", "last_name")
+
+        # Orcl nds shrt indx nms.  Sybs 2.
+        # OpenBase does not have named indexes.  You must specify a single column name
+        unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
+          connection.add_index("testings", ["last_name", "first_name"])
+          connection.remove_index("testings", :column => ["last_name", "first_name"])
+
+          # Oracle adapter cannot have specified index name larger than 30 characters
+          # Oracle adapter is shortening index name when just column list is given
+          unless current_adapter?(:OracleAdapter)
+            connection.add_index("testings", ["last_name", "first_name"])
+            connection.remove_index("testings", :name => :index_testings_on_last_name_and_first_name)
+            connection.add_index("testings", ["last_name", "first_name"])
+            connection.remove_index("testings", "last_name_and_first_name")
+          end
+          connection.add_index("testings", ["last_name", "first_name"])
+          connection.remove_index("testings", ["last_name", "first_name"])
+
+          connection.add_index("testings", ["last_name"], :length => 10)
+          connection.remove_index("testings", "last_name")
+
+          connection.add_index("testings", ["last_name"], :length => {:last_name => 10})
+          connection.remove_index("testings", ["last_name"])
+
+          connection.add_index("testings", ["last_name", "first_name"], :length => 10)
+          connection.remove_index("testings", ["last_name", "first_name"])
+
+          connection.add_index("testings", ["last_name", "first_name"], :length => {:last_name => 10, :first_name => 20})
+          connection.remove_index("testings", ["last_name", "first_name"])
+        end
+
+        # quoting
+        # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
+        # OpenBase does not have named indexes.  You must specify a single column name
+        unless current_adapter?(:OpenBaseAdapter)
+          connection.add_index("testings", ["key"], :name => "key_idx", :unique => true)
+          connection.remove_index("testings", :name => "key_idx", :unique => true)
+        end
+
+        # Sybase adapter does not support indexes on :boolean columns
+        # OpenBase does not have named indexes.  You must specify a single column
+        unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
+          connection.add_index("testings", %w(last_name first_name administrator), :name => "named_admin")
+          connection.remove_index("testings", :name => "named_admin")
+        end
+
+        # Selected adapters support index sort order
+        if current_adapter?(:SQLite3Adapter, :MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
+          connection.add_index("testings", ["last_name"], :order => {:last_name => :desc})
+          connection.remove_index("testings", ["last_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => {:last_name => :desc})
+          connection.remove_index("testings", ["last_name", "first_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => {:last_name => :desc, :first_name => :asc})
+          connection.remove_index("testings", ["last_name", "first_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => :desc)
+          connection.remove_index("testings", ["last_name", "first_name"])
+        end
+      end
+
       private
       def testing_table_with_only_foo_attribute
         connection.create_table :testings, :id => false do |t|
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 15677d80a0..33e03e71ee 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -62,69 +62,6 @@ class MigrationTest < ActiveRecord::TestCase
     Person.reset_column_information
   end
 
-  def test_add_index
-    # Limit size of last_name and key columns to support Firebird index limitations
-    Person.connection.add_column "people", "last_name", :string, :limit => 100
-    Person.connection.add_column "people", "key", :string, :limit => 100
-    Person.connection.add_column "people", "administrator", :boolean
-
-    assert_nothing_raised { Person.connection.add_index("people", "last_name") }
-    assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
-
-    # Orcl nds shrt indx nms.  Sybs 2.
-    # OpenBase does not have named indexes.  You must specify a single column name
-    unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.remove_index("people", :column => ["last_name", "first_name"]) }
-      # Oracle adapter cannot have specified index name larger than 30 characters
-      # Oracle adapter is shortening index name when just column list is given
-      unless current_adapter?(:OracleAdapter)
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.remove_index("people", :name => :index_people_on_last_name_and_first_name) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.remove_index("people", "last_name_and_first_name") }
-      end
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :length => 10) }
-      assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :length => {:last_name => 10}) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :length => 10) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :length => {:last_name => 10, :first_name => 20}) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-    end
-
-    # quoting
-    # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
-    # OpenBase does not have named indexes.  You must specify a single column name
-    unless current_adapter?(:OpenBaseAdapter)
-      Person.update_all "#{Person.connection.quote_column_name 'key'}=#{Person.connection.quote_column_name 'id'}" #some databases (including sqlite2 won't add a unique index if existing data non unique)
-      assert_nothing_raised { Person.connection.add_index("people", ["key"], :name => "key_idx", :unique => true) }
-      assert_nothing_raised { Person.connection.remove_index("people", :name => "key_idx", :unique => true) }
-    end
-
-    # Sybase adapter does not support indexes on :boolean columns
-    # OpenBase does not have named indexes.  You must specify a single column
-    unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
-      assert_nothing_raised { Person.connection.add_index("people", %w(last_name first_name administrator), :name => "named_admin") }
-      assert_nothing_raised { Person.connection.remove_index("people", :name => "named_admin") }
-    end
-
-    # Selected adapters support index sort order
-    if current_adapter?(:SQLite3Adapter, :MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :order => {:last_name => :desc}) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc}) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc, :first_name => :asc}) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => :desc) }
-      assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-    end
-  end
-
   def test_index_symbol_names
     assert_nothing_raised { Person.connection.add_index :people, :primary_contact_id, :name => :symbol_index_name }
     assert Person.connection.index_exists?(:people, :primary_contact_id, :name => :symbol_index_name)