Changeset 4340

Timestamp:

05/14/06 18:37:22 (2 years ago)

Author:

marcel

Message:

Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. [pdcawley@bofh.org.uk]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. [pdcawley@bofh.org.uk] 
-
-* PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 [keegan@thebasement.org]

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

@@ -309 +309 @@
-
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-
+
+
+
-        
-        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"

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

@@ -244 +244 @@
-            self.type    = type
-            self.limit   = options[:limit] if options[:limit]
-if options[:default]
+unless options[:default].nil?
-          end
-        end

trunk/activerecord/test/migration_test.rb

@@ -1 +1 @@
-require 'abstract_unit'
-require 'fixtures/person'
+require 'fixtures/topic'
-require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
-require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
@@ -321 +322 @@
-      assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer }
-      assert new_columns.find { |c| c.name == 'age' and c.type == :string }
+
+      old_columns = Topic.connection.columns(Topic.table_name, "#{name} Columns")
+      assert old_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
+      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => false }
+      new_columns = Topic.connection.columns(Topic.table_name, "#{name} Columns")
+      assert_nil new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
+      assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
-    end    
-