diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-25 00:34:09 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-25 00:34:09 -0800 |
| commit | 40295aa0abfa9d2c5e821673d7d514445b943892 (patch) | |
| tree | c46887a9d311bb834cd74067581517e1a52ae2d2 /activerecord/lib | |
| parent | b1f8ba138360cd67994d4134f57abca74f8528bc (diff) | |
| parent | 6cde635f34dc65a8c6f2d87ca995120fcf0ea25f (diff) | |
| download | rails-40295aa0abfa9d2c5e821673d7d514445b943892.tar.gz rails-40295aa0abfa9d2c5e821673d7d514445b943892.tar.bz2 rails-40295aa0abfa9d2c5e821673d7d514445b943892.zip | |
Merge pull request #4651 from paul/mysql-add-index-bug
Handle nil in add_index :length option in MySQL
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 560773ca86..201c05d8f5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -541,7 +541,7 @@ module ActiveRecord if options.is_a?(Hash) && length = options[:length] case length when Hash - column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name)} + column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && length[name].present?} when Fixnum column_names.each {|name| option_strings[name] += "(#{length})"} end |