aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration/command_recorder.rb
diff options
context:
space:
mode:
authorDavid Workman <workmad3@gmail.com>2011-05-23 22:33:03 +0100
committerDavid Workman <workmad3@gmail.com>2011-05-23 22:33:03 +0100
commit86afbf7464e96dd156895eba2fa44b41678cdd6e (patch)
tree57deaac74a052492142cee44c0ddd764bf0b0af8 /activerecord/lib/active_record/migration/command_recorder.rb
parent8588dd431b03616ed815c8ee82a387540a6e571b (diff)
downloadrails-86afbf7464e96dd156895eba2fa44b41678cdd6e.tar.gz
rails-86afbf7464e96dd156895eba2fa44b41678cdd6e.tar.bz2
rails-86afbf7464e96dd156895eba2fa44b41678cdd6e.zip
Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
Diffstat (limited to 'activerecord/lib/active_record/migration/command_recorder.rb')
-rw-r--r--activerecord/lib/active_record/migration/command_recorder.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb
index 5923993229..88752aa013 100644
--- a/activerecord/lib/active_record/migration/command_recorder.rb
+++ b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -80,11 +80,8 @@ module ActiveRecord
def invert_add_index(args)
table, columns, options = *args
- if options && options[:name]
- options_hash = {:name => options[:name]}
- else
- options_hash = {:column => columns}
- end
+ index_name = options.try(:[], :name)
+ options_hash = index_name ? {:name => index_name} : {:column => columns}
[:remove_index, [table, options_hash]]
end