Made default changes work in both postgresql and mysql #1612 [Tobias Luetke]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 14343b2750..017e1ba5a5 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -198,9 +198,17 @@ module ActiveRecord
       def create_database(name)
         execute "CREATE DATABASE #{name}"
       end
+      
+      def change_column_default(table_name, column_name, default)
+        current_type = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Type"]
+
+        change_column(table_name, column_name, current_type, { :default => default })
+      end
 
       def change_column(table_name, column_name, type, options = {})
-        change_column_sql = "ALTER TABLE #{table_name} MODIFY #{column_name} #{type}"
+        options[:default] ||= select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
+        
+        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"
         add_column_options!(change_column_sql, options)
         execute(change_column_sql)
       end