diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-13 02:32:30 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-13 02:32:30 -0800 |
| commit | 85741dd1750fe5cb68e04b876ea61f6065982ac2 (patch) | |
| tree | 6830c6aca42f470a92b06f433d804e25bef38303 /activerecord/lib/active_record | |
| parent | 4737ad3233c4ef06f33da2296999939d53c4644b (diff) | |
| parent | 349d4606004d20cb0ace1980bcb6d0af13f6b504 (diff) | |
| download | rails-85741dd1750fe5cb68e04b876ea61f6065982ac2.tar.gz rails-85741dd1750fe5cb68e04b876ea61f6065982ac2.tar.bz2 rails-85741dd1750fe5cb68e04b876ea61f6065982ac2.zip | |
Merge pull request #8500 from senny/8492_migrations_crash_on_specific_path
Recognize migrations, in folders containing numbers and 'rb'
Diffstat (limited to 'activerecord/lib/active_record')
| -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 22347fcaef..ef2107ad24 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -665,7 +665,7 @@ module ActiveRecord files = Dir[*paths.map { |p| "#{p}/**/[0-9]*_*.rb" }] 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 |