Changeset 7790

Timestamp:

10/08/07 03:28:28 (1 year ago)

Author:

bitsweat

Message:

MySQL: fix change_column on not-null columns that don't accept dfeault values of . Closes #6663.

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* MySQL: fix change_column on not-null columns that don't accept dfeault values of ''.  #6663 [Jonathan Viney, Tarmo TÀnav]
-
-* validates_uniqueness_of behaves well with single-table inheritance.  #3833 [Gabriel Gironda, rramdas, François Beausoleil, Josh Peek, Tarmo TÀnav]

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

@@ -409 +409 @@
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-        unless options_include_default?(options)
-result = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")
-result['Default']
+column = columns(table_name).find { |c| c.name == column_name.to_s }
+column.default
-          else
-            raise "No such column: #{table_name}.#{column_name}"

trunk/activerecord/test/migration_test.rb

@@ -428 +428 @@
-        Person.connection.remove_column("people", "group") rescue nil
-        Person.connection.add_column("people", "first_name", :string) rescue nil
+      end
+    end
+    
+    def test_change_type_of_not_null_column
+      assert_nothing_raised do
+        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
+        Topic.reset_column_information
+        
+        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
+        Topic.reset_column_information
-      end
-    end