Ticket #6999: rename_column_migration_in_mysql_keeps_default_and_null_state_and_auto_increment.diff

activerecord/test/migration_test.rb

@@ -421 +421 @@
-      end
-    end
-
+    def test_rename_column_preserves_default_and_not_null_state
+      begin
+        Person.connection.add_column "people", "contibutions", :integer, :default => 10, :null => false
+        Person.reset_column_information
+        columns = Person.connection.columns(:people)
+        column = columns.detect { |c| c.name == "contibutions" }
+        assert_equal 10, column.default
+        assert !column.null
+
+        Person.connection.rename_column("people", "contibutions", "contributions")
+        Person.reset_column_information
+        columns = Person.connection.columns(:people)
+        column = columns.detect { |c| c.name == "contributions" }
+        assert_equal 10, column.default
+        assert !column.null
+      ensure
+        Person.connection.remove_column("people", "contibutions") rescue ActiveRecord::StatementInvalid
+        Person.connection.remove_column("people", "contributions") rescue ActiveRecord::StatementInvalid
+      end
+    end
+
+    if current_adapter?(:MysqlAdapter)
+      def test_rename_column_preserves_auto_increment
+        begin
+          ActiveRecord::Base.connection.create_table(:legacy) {} # We just need the id column
+          legacy = Class.new(ActiveRecord::Base)
+          legacy.send(:define_attr_method, :table_name, "legacy")
+          options = legacy.connection.select_one("SHOW COLUMNS FROM legacy LIKE 'id'")
+          assert_equal 'auto_increment', options['Extra'] 
+
+          legacy.connection.rename_column("legacy", "id", "orig_id")
+          options = legacy.connection.select_one("SHOW COLUMNS FROM legacy LIKE 'orig_id'")
+          assert_equal 'auto_increment', options['Extra'] 
+        ensure
+          ActiveRecord::Base.connection.drop_table :legacy rescue nil
+        end
+      end
+      
+      def test_rename_column_does_handle_mysql_misreport_of_not_null_column_default
+        begin
+          Person.connection.add_column "people", "contibutions", :integer, :null => false
+          Person.reset_column_information
+          columns = Person.connection.columns(:people)
+          column = columns.detect { |c| c.name == "contibutions" }
+          assert_equal nil, column.default
+          assert !column.null
+
+          Person.connection.rename_column("people", "contibutions", "contributions")
+          Person.reset_column_information
+          columns = Person.connection.columns(:people)
+          column = columns.detect { |c| c.name == "contributions" }
+          assert_equal nil, column.default
+          assert !column.null
+        ensure
+          Person.connection.remove_column("people", "contibutions") rescue ActiveRecord::StatementInvalid
+          Person.connection.remove_column("people", "contributions") rescue ActiveRecord::StatementInvalid
+        end
+      end
+      
+      def test_rename_column_keeps_empty_default
+        begin
+          Person.connection.add_column "people", "state", :string, :default => ""
+          Person.reset_column_information
+          columns = Person.connection.columns(:people)
+          column = columns.detect { |c| c.name == "state" }
+          assert_equal '', column.default
+          assert column.null
+
+          Person.connection.rename_column("people", "state", "mood")
+          Person.reset_column_information
+          columns = Person.connection.columns(:people)
+          column = columns.detect { |c| c.name == "mood" }
+          assert_equal '', column.default
+          assert column.null
+        ensure
+          Person.connection.remove_column("people", "state") rescue ActiveRecord::StatementInvalid
+          Person.connection.remove_column("people", "mood") rescue ActiveRecord::StatementInvalid
+        end
+      end
+    end
+
-    def test_rename_table
-      begin
-        ActiveRecord::Base.connection.create_table :octopuses do |t|

activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -88 +88 @@
-      TYPES_DISALLOWING_DEFAULT = Set.new([:binary, :text])
-      TYPES_ALLOWING_EMPTY_STRING_DEFAULT = Set.new([:string])
-
-
+
+
+
-        @original_default = default
-
+(name, default, sql_type, null)
-        @default = nil if no_default_allowed? || missing_default_forged_as_empty_string?
-        @default = '' if @original_default == '' && no_default_allowed?
+        @extra = extra
-      end
-
-      private
@@ -412 +415 @@
-      end
-
-      def rename_column(table_name, column_name, new_column_name) #:nodoc:
-
-
+
+
+
+
+
-      end
-
+      def add_column_options!(sql, options) #:nodoc:
+        super
+        sql << " #{options[:extra]}" unless options[:extra].blank?
+      end
-
-      # SHOW VARIABLES LIKE 'name'
-      def show_variable(name)