Ticket #6956: change_column_default_to_null.diff

test/migration_test.rb

@@ -433 +433 @@
-      Person.reset_column_information
-      assert !Person.new.administrator?
-    end
+    
+    def test_change_column_with_nil_default
+      Person.connection.add_column "people", "contributor", :boolean, :default => true
+      Person.reset_column_information
+      assert Person.new.contributor?
+      
+      assert_nothing_raised { Person.connection.change_column "people", "contributor", :boolean, :default => nil }
+      Person.reset_column_information
+      assert !Person.new.contributor?
+      assert_nil Person.new.contributor
+    end
-
-    def test_add_table
-      assert !Reminder.table_exists?

lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -276 +276 @@
-      end            
-    
-      def add_column_options!(sql, options) #:nodoc:
-unless options[:default].nil?
+if options.include?(:default) && !(options[:default].nil? && options[:null] == false)
-        sql << " NOT NULL" if options[:null] == false
-      end
-

lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -267 +267 @@
-          definition[column_name].instance_eval do
-            self.type    = type
-            self.limit   = options[:limit] if options[:limit]
-unless options[:default].nil?
+if options.include?(:default) && !(options[:default].nil? && options[:null] == false)
-          end
-        end
-      end

lib/active_record/connection_adapters/frontbase_adapter.rb

@@ -800 +800 @@
-            default_value = options[:default] == 0 ? quoted_false : quoted_true
-          end
-        end
-unless options[:default].nil?
+if options.include?(:default) && !(options[:default].nil? && options[:null] == false)
-        sql << " NOT NULL" if options[:null] == false
-      end
-

lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -345 +345 @@
-          rename_column(table_name, "#{column_name}_ar_tmp", column_name)
-          commit_db_transaction
-        end
-unless options[:default].nil?
+if options.include?(:default) && !(options[:default].nil? && options[:null] == false)
-      end
-
-      def change_column_default(table_name, column_name, default) #:nodoc:
-'#{default}'
+#{quote(default)}
-      end
-
-      def rename_column(table_name, column_name, new_column_name) #:nodoc:

lib/active_record/connection_adapters/mysql_adapter.rb

@@ -364 +364 @@
-      end
-
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-if options[:default].nil?
+unless options.include?(:default)
-          options[:default] = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
-        end
-        

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -458 +458 @@
-      
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-        sql_commands = ["ALTER TABLE #{table_name} ALTER COLUMN #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"]
-unless options[:default].nil?
+if options.include?(:default)
-          remove_default_constraint(table_name, column_name)
-          sql_commands << "ALTER TABLE #{table_name} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(options[:default])} FOR #{column_name}"
-        end