diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-10 14:24:28 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-10 14:24:28 +0000 |
commit | 65786805ca89bbcaf7aa89e74f99964e0f5fd89e (patch) | |
tree | 98a49d4d0c88dac11b1f062af5c6ef306727d951 /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | |
parent | 4f2f408ba1a7dd976a1ec5061d05ef0439e5f942 (diff) | |
download | rails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.tar.gz rails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.tar.bz2 rails-65786805ca89bbcaf7aa89e74f99964e0f5fd89e.zip |
More incremental work on active schema for MySQL
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index b0865d9aab..ba18bad504 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -377,8 +377,9 @@ module ActiveRecord end def add_column(table_name, column_name, type, options = {}) - add_column_sql = "ALTER TABLE #{table_name} ADD #{column_name} #{native_database_types[type]}" - add_column_sql << "(#{limit})" if options[:limit] + native_type = native_database_types[type] + add_column_sql = "ALTER TABLE #{table_name} ADD #{column_name} #{native_type[:name]}" + add_column_sql << "(#{options[:limit] || native_type[:limit]})" if options[:limit] || native_type[:limit] add_column_sql << " DEFAULT '#{options[:default]}'" if options[:default] execute(add_column_sql) end |