Changeset 8453

Timestamp:

12/20/07 22:28:12 (1 year ago)

Author:

bitsweat

Message:

SQLite: fix rename_ and remove_column for columns with unique indexes. Closes #10576.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (3 diffs)
• trunk/activerecord/test/migration_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* SQLite: fix rename_ and remove_column for columns with unique indexes.  #10576 [Brandon Keepers]
-
-* Ruby 1.9 compatibility.  [Jeremy Kemper]

trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -305 +305 @@
-          end
-
-
+, options[:rename] || {}
-          copy_table_contents(from, to,
-            @definition.columns.map {|column| column.name},
@@ -311 +311 @@
-        end
-
-
+, rename = {}
-          indexes(from).each do |index|
-            name = index.name
@@ -320 +320 @@
-            end
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-          end
-        end

trunk/activerecord/test/migration_test.rb

@@ -432 +432 @@
-    end
-    
+    def test_rename_column_with_an_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      Person.connection.add_index :people, :first_name
+      assert_nothing_raised do
+        Person.connection.rename_column "hats", "hat_name", "name"
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
+    def test_remove_column_with_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      ActiveRecord::Base.connection.add_index "hats", "hat_size"
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
+    def test_remove_column_with_multi_column_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+        table.column :hat_style, :string, :limit => 100
+      end
+      ActiveRecord::Base.connection.add_index "hats", ["hat_style", "hat_size"], :unique => true
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
-    def test_change_type_of_not_null_column
-      assert_nothing_raised do