Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handling add/remove to/from migration edge cases #30011

Merged

Conversation

guilherme
Copy link
Contributor

@guilherme guilherme commented Jul 31, 2017

Making sure the table name is parsed correctly when an add/remove column migration have 'from' in the table name.

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @pixeltrix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@pixeltrix
Copy link
Contributor

@guilherme thanks for the PR - what happens when you do rails g migration RemoveOriginallyFromFromUsers or AddSentToToUsers ?

@guilherme guilherme force-pushed the fix-migration-generator-special-cases branch from 6f19e2a to 1db284e Compare July 31, 2017 13:05
@guilherme
Copy link
Contributor Author

@pixeltrix it works fine. I've just updated the PR with the scenario that I am having the issue.

I tried to generalize and I thought the test was failing for that generic case but it wasn't, just double checked. My bad.

Copy link
Member

@rafaelfranca rafaelfranca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are broken

@guilherme guilherme force-pushed the fix-migration-generator-special-cases branch 3 times, most recently from 9a21c9c to bd8da74 Compare August 1, 2017 08:13
@@ -28,7 +28,7 @@ def create_migration_file
def set_local_assigns!
@migration_template = "migration.rb"
case file_name
when /^(add|remove)_.*_(?:to|from)_(.*)/
when /^(add)_.*_(?:to)_(.*)/, /^(remove)_.*?_(?:to|from)_(.*)/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same change (and test) should be made to allow migration = "remove_email_address_from_sent_to_user"

The uncaptured groups can then be removed entirely:

when /^(add)_.*_to_(.*)/, /^(remove)_.*_from_(.*)/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the feedback! I was trying to come up with a table name with "to" on the title but couldn't find it :)

@guilherme guilherme force-pushed the fix-migration-generator-special-cases branch from bd8da74 to b63db87 Compare August 2, 2017 13:42
@@ -73,6 +84,17 @@ def test_remove_migration_with_attributes
end
end

def test_remove_migration_with_table_having_from_in_title
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test_remove_migration_with_table_having_fromto_in_title

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Making sure the table name is parsed correctly when an add/remove column migration have 'from'/'to' in the table name.
@guilherme guilherme force-pushed the fix-migration-generator-special-cases branch from b63db87 to 1cc6c74 Compare August 3, 2017 07:17
@sgrif sgrif merged commit c6dcee4 into rails:master Aug 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants