Merge commit 'hlame_rails_sql_server_adapter/master'

Author: snowblink

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -453,19 +453,7 @@ def tables(name = nil)
 
       def indexes(table_name, name = nil)
         ActiveRecord::Base.connection.instance_variable_get("@connection")["AutoCommit"] = false
-        indexes = []        
-        execute("EXEC sp_helpindex '#{table_name}'", name) do |handle|
-          if handle.column_info.any?
-            handle.each do |index| 
-              unique = index[1] =~ /unique/
-              primary = index[1] =~ /primary key/
-              if !primary
-                indexes << IndexDefinition.new(table_name, index[0], unique, index[2].split(", ").map {|e| e.gsub('(-)','')})
-              end
-            end
-          end
-        end
-        indexes
+        __indexes(table_name, name)
       ensure
         ActiveRecord::Base.connection.instance_variable_get("@connection")["AutoCommit"] = true
       end
@@ -507,6 +495,7 @@ def change_column_default(table_name, column_name, default)
       def remove_column(table_name, column_name)
         remove_check_constraints(table_name, column_name)
         remove_default_constraint(table_name, column_name)
+        remove_indexes(table_name, column_name)
         execute "ALTER TABLE [#{table_name}] DROP COLUMN #{quote_column_name(column_name)}"
       end
 
@@ -526,11 +515,33 @@ def remove_check_constraints(table_name, column_name)
         end
       end
 
+      def remove_indexes(table_name, column_name)
+        __indexes(table_name).select {|idx| idx.columns.include? column_name }.each do |idx|
+          remove_index(table_name, {:name => idx.name})
+        end
+      end
+      
       def remove_index(table_name, options = {})
         execute "DROP INDEX #{table_name}.#{quote_column_name(index_name(table_name, options))}"
       end
 
-      private 
+      private
+        def __indexes(table_name, name = nil)
+          indexes = []        
+          execute("EXEC sp_helpindex '#{table_name}'", name) do |handle|
+            if handle.column_info.any?
+              handle.each do |index| 
+                unique = index[1] =~ /unique/
+                primary = index[1] =~ /primary key/
+                if !primary
+                  indexes << IndexDefinition.new(table_name, index[0], unique, index[2].split(", ").map {|e| e.gsub('(-)','')})
+                end
+              end
+            end
+          end
+          indexes
+        end
+      
         def select(sql, name = nil)
           repair_special_columns(sql)
 

test/cases/aaaa_create_tables_test_sqlserver.rb

@@ -9,15 +9,15 @@ def setup
     @base_path = "#{File.dirname(__FILE__)}/../fixtures/db_definitions"
   end
 
-  def test_sqlserver_load_test_schema
+  def __test_sqlserver_load_test_schema
     execute_sql_file("#{@base_path}/sqlserver.drop.sql", ActiveRecord::Base.connection)
     execute_sql_file("#{@base_path}/sqlserver.sql", ActiveRecord::Base.connection)
     execute_sql_file("#{@base_path}/sqlserver2.drop.sql", Course.connection)
     execute_sql_file("#{@base_path}/sqlserver2.sql", Course.connection)
     assert true
   end
 
-  def __test_activerecord_load_test_schema
+  def test_activerecord_load_test_schema
     eval(File.read("#{@ar_path}/schema.rb"))
     connection = ActiveRecord::Base.connection
     begin

test/cases/affected_rows_test_sqlserver.rb

@@ -20,7 +20,7 @@ def test_affected_rows
     assert_equal "1 updated", Topic.find(1).content
     assert_equal "2 updated", Topic.find(2).content
 
-    assert_equal 2, Topic.delete_all        
+    assert_equal 2, Topic.delete([1, 2])        
   end
 
   def test_update_sql_statement_invalid