From 223d6415d045e670610603665c21e93b06a01db7 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 18 May 2010 11:02:39 -0700 Subject: Revert "Don't carry default value when changing column for a binary type on MySQL" Broke mysql tests. This reverts commit edec1afe25014749f0e2df86d27477b45586a9e3. Conflicts: activerecord/test/cases/migration_test.rb [#3234 state:open] --- activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index e12924e63f..ec25bbf18e 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -513,7 +513,7 @@ module ActiveRecord def change_column(table_name, column_name, type, options = {}) #:nodoc: column = column_for(table_name, column_name) - if has_default?(type) && !options_include_default?(options) + unless options_include_default?(options) options[:default] = column.default end @@ -675,10 +675,6 @@ module ActiveRecord end column end - - def has_default?(sql_type) - sql_type =~ :binary || sql_type == :text #mysql forbids defaults on blob and text columns - end end end end -- cgit v1.2.3