Changeset 5937

Timestamp:

01/15/07 02:22:53 (2 years ago)

Author:

bitsweat

Message:

change_column accepts :default => nil. Closes #6956.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/firebird_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb (modified) (1 diff)
• trunk/activerecord/test/migration_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* change_column accepts :default => nil.  #6956 [dcmanges, Jeremy Kemper]
-
-* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, manfred, altano@bigfoot.com]

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -254 +254 @@
-      #   <tt>:binary</tt> or <tt>:integer</tt> columns only)
-      # * <tt>:default</tt>:
-
-
-
+
-      # * <tt>:null</tt>:
-      #   Allows or disallows +NULL+ values in the column.  This option could
@@ -272 +270 @@
-      # * MySQL: <tt>:precision</tt> [1..63], <tt>:scale</tt> [0..30]. 
-      #   Default is (10,0).
-Gres?
+greSQL
-      #   <tt>:scale</tt> [0..infinity]. No default.
-ql
+QL
-      #   Internal storage as strings. No default.
-ql
+QL
-      #   but the maximum supported <tt>:precision</tt> is 16. No default.
-      # * Oracle: <tt>:precision</tt> [1..38], <tt>:scale</tt> [-84..127]. 

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -274 +274 @@
-          column_type_sql
-        end
-            
-
+
+
-      def add_column_options!(sql, options) #:nodoc:
-unless options[:default].nil?
+if options_include_default?(options)
-        sql << " NOT NULL" if options[:null] == false
-      end
@@ -294 +294 @@
-        sql << "ORDER BY #{options[:order]}"
-      end
+
+      protected
+        def options_include_default?(options)
+          options.include?(:default) && !(options[:null] == false && options[:default].nil?)
+        end
-    end
-  end

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

@@ -506 +506 @@
-      def change_column(table_name, column_name, type, options = {}) # :nodoc:
-        change_column_type(table_name, column_name, type, options)
-[:position]
-.has_key?(:default
+.include?(:position)
+_include_default?(options
-      end
-

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

@@ -796 +796 @@
-      def add_column_options!(sql, options) #:nodoc:
-        default_value = quote(options[:default], options[:column])
-[:default]
+_include_default?(options)
-          if options[:type] == :boolean
-            default_value = options[:default] == 0 ? quoted_false : quoted_true
-          end
-end
-sql << " DEFAULT #{default_value}" unless options[:default].nil?
+  sql << " DEFAULT #{default_value}"
+end
-        sql << " NOT NULL" if options[:null] == false
-      end
@@ -829 +829 @@
-        change_column_sql = %( ALTER TABLE "#{table_name}" ALTER COLUMN "#{column_name}" )
-
-default_value = quote(options[:default], options[:column]
-if options[:default]
+if options_include_default?(options
+  default_value = quote(options[:default], options[:column])
-          if type == :boolean
-            default_value = options[:default] == 0 ? quoted_false : quoted_true
-          end
-        end
-
-        if default_value != "NULL"
-          change_column_sql << " SET DEFAULT #{default_value}"
-
-
+
+
+
-        
-#         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/mysql_adapter.rb

@@ -365 +365 @@
-
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-if options[:default].nil?
+unless options_include_default?(options)
-          options[:default] = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
-        end
-
+
-        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        add_column_options!(change_column_sql, options)

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

@@ -322 +322 @@
-
-        # Set optional default. If not null, update nulls to the new default.
-unless default.nil?
+if options_include_default?(options)
-          change_column_default(table_name, column_name, default)
-          if notnull
-'#{default}'
+#{quote(default, options[:column])}
-          end
-        end
@@ -346 +346 @@
-          commit_db_transaction
-        end
-
+
+
+
+
-      end
-

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

@@ -265 +265 @@
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-        alter_table(table_name) do |definition|
+          include_default = options_include_default?(options)
-          definition[column_name].instance_eval do
-            self.type    = type
-[:limit]
-unless options[:default].nil?
+.include?(:limit)
+if include_default
-          end
-        end

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

@@ -460 +460 @@
-      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?(options)
-          remove_default_constraint(table_name, column_name)
-
+, options[:column]
-        end
-        sql_commands.each {|c|

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

@@ -382 +382 @@
-
-      def add_column_options!(sql, options) #:nodoc:
-unless options[:default].nil?
+if options_include_default?(options)
-
-        if check_null_for_column?(options[:column], sql)

trunk/activerecord/test/migration_test.rb

@@ -95 +95 @@
-
-    def test_create_table_with_not_null_column
-
-
+
+
+
+
-      end
-
@@ -423 +425 @@
-      assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
-      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => true }
+    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
-