@@ -662,12 +662,13 @@ module ActiveRecord end def change_column(table_name, column_name, type, options = {}) + remove_default_constraint(table_name, column_name) sql_commands = [] change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}" change_column_sql << " NOT NULL" if options[:null] == false sql_commands << change_column_sql + if options_include_default?(options) - remove_default_constraint(table_name, column_name) sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_name(table_name,column_name)} DEFAULT #{quote(options[:default])} FOR #{quote_column_name(column_name)}" end sql_commands.each { |c| do_execute(c) } lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -30,6 +30,20 @@ class MigrationTestSqlserver < ActiveRecord::TestCase end + context 'For changing column' do + + should 'not raise exception when column contains default constraint' do + # TODO: make sure people's lock version contains default constraint + old_columns = Person.connection.columns(Person.table_name) + assert old_columns.find { |c| c.name == 'lock_version' and !c.default.nil? } + + assert_nothing_raised { Person.connection.change_column 'people', 'lock_version', :string } + + new_columns = Person.connection.columns(Person.table_name) + assert new_columns.find { |c| c.name == 'lock_version' and c.type == :string } + end + + end end test/cases/migration_test_sqlserver.rb 7bdf4d80e21729930531e82bb3accb5b37b4c15c gcheong gary.s.cheong@aexp.com http://github.com/iawgens/2000-2005-adapter/commit/0564f73506cbe2ed71f8dd6244cb75c97b7d069d 0564f73506cbe2ed71f8dd6244cb75c97b7d069d 2009-10-28T08:13:38-07:00 2009-10-28T08:13:38-07:00 Fixed changing column when the column has existing default constraint 24ad8bbfa60e76d5148698983c86b206718a0c43 gcheong gary.s.cheong@aexp.com