Added migration support to SQL Server adapter (please someone do the same for Oracle and DB2) (closes #2625) [Tom Ward]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2778 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 366192909e..6a6f368210 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -184,23 +184,25 @@ module ActiveRecord
       #   remove_index :accounts, :column => :branch_id
       # Remove the index named by_branch_party in the accounts table.
       #   remove_index :accounts, :name => :by_branch_party
+      
       def remove_index(table_name, options = {})
+        execute "DROP INDEX #{index_name(table_name, options)} ON #{table_name}"
+      end
+
+      def index_name(table_name, options) #:nodoc:
         if Hash === options # legacy support
           if options[:column]
-            index_name = "#{table_name}_#{options[:column]}_index"
+            "#{table_name}_#{options[:column]}_index"
           elsif options[:name]
-            index_name = options[:name]
+            options[:name]
           else
             raise ArgumentError, "You must specify the index name"
           end
         else
-          index_name = "#{table_name}_#{options}_index"
+          "#{table_name}_#{options}_index"
         end
-
-        execute "DROP INDEX #{index_name} ON #{table_name}"
       end
 
-
       # Returns a string of <tt>CREATE TABLE</tt> SQL statement(s) for recreating the
       # entire structure of the database.
       def structure_dump