diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-08 03:28:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-08 03:28:28 +0000 |
| commit | 85c86f09997fff1f07f5d58ecf69780d597e292c (patch) | |
| tree | b604f3ae483faef737b9779cc1f8f29e685cb1d8 /activerecord/lib/active_record/connection_adapters | |
| parent | b1e394e67f0b079335c936b6b120b92f00a244c5 (diff) | |
| download | rails-85c86f09997fff1f07f5d58ecf69780d597e292c.tar.gz rails-85c86f09997fff1f07f5d58ecf69780d597e292c.tar.bz2 rails-85c86f09997fff1f07f5d58ecf69780d597e292c.zip | |
MySQL: fix change_column on not-null columns that don't accept dfeault values of ''. Closes #6663.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7790 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index f0d6e443a7..62cfc345a3 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -408,8 +408,8 @@ module ActiveRecord def change_column(table_name, column_name, type, options = {}) #:nodoc: unless options_include_default?(options) - if result = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'") - options[:default] = result['Default'] + if column = columns(table_name).find { |c| c.name == column_name.to_s } + options[:default] = column.default else raise "No such column: #{table_name}.#{column_name}" end |