Use algorithm while removing index with db:rollback #24199
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @arthurnn (@rails-bot has picked a reviewer for you, use r? to override) |
arthurnn
reviewed
Oct 27, 2016
| @@ -163,8 +163,8 @@ def invert_add_index(args) | |||
| table, columns, options = *args | |||
| options ||= {} | |||
|
|
|||
| index_name = options[:name] | |||
| options_hash = index_name ? { name: index_name } : { column: columns } | |||
| options_hash = options.slice(:name, :algorithm) | |||
There was a problem hiding this comment.
is there other options we want to keep?
There was a problem hiding this comment.
I confirmed that remove_index handles only :name and :algorithm.
kamipo
reviewed
Sep 21, 2017
| @@ -163,8 +163,8 @@ def invert_add_index(args) | |||
| table, columns, options = *args | |||
| options ||= {} | |||
|
|
|||
| index_name = options[:name] | |||
| options_hash = index_name ? { name: index_name } : { column: columns } | |||
| options_hash = options.slice(:name, :algorithm) | |||
There was a problem hiding this comment.
I confirmed that remove_index handles only :name and :algorithm.
| index_name = options[:name] | ||
| options_hash = index_name ? { name: index_name } : { column: columns } | ||
| options_hash = options.slice(:name, :algorithm) | ||
| options_hash.merge!(column: columns) if !options_hash[:name] |
There was a problem hiding this comment.
.merge!(column: columns) creates extra new column: columns hash.
How about options_hash[:column] = columns unless options_hash[:name] or simply one line fix as following?
--- a/activerecord/lib/active_record/migration/command_recorder.rb
+++ b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -163,6 +163,7 @@ def invert_add_index(args)
index_name = options[:name]
options_hash = index_name ? { name: index_name } : { column: columns }
+ options_hash[:algorithm] = options[:algorithm] if options[:algorithm]
[:remove_index, [table, options_hash]]
endThere was a problem hiding this comment.
Thanks for your comment, I agree using merge! was not the best way.
Updated the pr.
meinac
force-pushed
the
fix_invert_add_index
branch
from
fd0d37d to
611f2b2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More information can be found in #24190.
Closes #24190