diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-12-12 21:51:38 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@garaio.com> | 2012-12-13 11:40:02 +0100 |
| commit | d68e299167c8da07dc63a55197313b5c3396c3a4 (patch) | |
| tree | e157f4439543540dae9bac669c4f74c2de8f7185 /activerecord/lib | |
| parent | 6fbee4fc539cc29c68c0d515fa5e0af208f3f681 (diff) | |
| download | rails-d68e299167c8da07dc63a55197313b5c3396c3a4.tar.gz rails-d68e299167c8da07dc63a55197313b5c3396c3a4.tar.bz2 rails-d68e299167c8da07dc63a55197313b5c3396c3a4.zip | |
recognize migrations, in folders containing numbers and 'rb'.
Backport of #8500
Closes #8492
Conflicts:
activerecord/test/cases/migrator_test.rb
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 6420f81347..e8ec93470d 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -627,7 +627,7 @@ module ActiveRecord seen = Hash.new false migrations = files.map do |file| - version, name, scope = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?.rb/).first + version, name, scope = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?\.rb\z/).first raise IllegalMigrationNameError.new(file) unless version version = version.to_i |