aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-08-03 11:34:21 -0400
committerGitHub <noreply@github.com>2017-08-03 11:34:21 -0400
commitc6dcee4770b06ee3cd88a63cceb3988806ffd383 (patch)
treef0f6577fd307469f958b83b9e7fe815c414bb5a5 /activerecord/lib
parentf105ab0445b07d11d551678f9fbc3298301da5a1 (diff)
parent1cc6c74db20de139f6ad3bedc7cd7e28dc83283e (diff)
downloadrails-c6dcee4770b06ee3cd88a63cceb3988806ffd383.tar.gz
rails-c6dcee4770b06ee3cd88a63cceb3988806ffd383.tar.bz2
rails-c6dcee4770b06ee3cd88a63cceb3988806ffd383.zip
Merge pull request #30011 from guilherme/fix-migration-generator-special-cases
Handling add/remove to/from migration edge cases
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/rails/generators/active_record/migration/migration_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index 0174c7ea31..856fcc5897 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -28,7 +28,7 @@ module ActiveRecord
def set_local_assigns!
@migration_template = "migration.rb"
case file_name
- when /^(add|remove)_.*_(?:to|from)_(.*)/
+ when /^(add)_.*_to_(.*)/, /^(remove)_.*?_from_(.*)/
@migration_action = $1
@table_name = normalize_table_name($2)
when /join_table/