diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-03 16:41:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-03 16:42:08 -0700 |
| commit | 69a2c6b0419177448d9811745cf4035d46b68bbd (patch) | |
| tree | 95fa33418d1b1ee31ffb4fa0bb60b4fa411f7b47 /activerecord/lib/active_record/migration.rb | |
| parent | 365c93b7cdaa161c77c157c7cc385221ebbc33c7 (diff) | |
| download | rails-69a2c6b0419177448d9811745cf4035d46b68bbd.tar.gz rails-69a2c6b0419177448d9811745cf4035d46b68bbd.tar.bz2 rails-69a2c6b0419177448d9811745cf4035d46b68bbd.zip | |
converting inject([]) to map
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 7a1504430b..9ac18f9939 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -509,20 +509,19 @@ module ActiveRecord seen = Hash.new false - migrations = files.inject([]) do |klasses, file| + migrations = files.map do |file| version, name, scope = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?.rb/).first - name = name.camelize raise IllegalMigrationNameError.new(file) unless version version = version.to_i + name = name.camelize raise DuplicateMigrationVersionError.new(version) if seen[version] raise DuplicateMigrationNameError.new(name) if seen[[name, scope]] seen[version] = seen[[name, scope]] = true - migration = MigrationProxy.new(name, version, file, scope) - klasses << migration + MigrationProxy.new(name, version, file, scope) end migrations.sort_by(&:version) |