diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-10 14:02:21 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-10 14:02:21 -0800 |
| commit | 4663070d28c9cc63cd349c811249bd5cdf1ec647 (patch) | |
| tree | 6faaeaa3c5462c4bc8e85eb24bffce88b20d2fe4 /activerecord/lib | |
| parent | 42fd1642bd3c76d4eef6bc4aebe774319cbcdf78 (diff) | |
| download | rails-4663070d28c9cc63cd349c811249bd5cdf1ec647.tar.gz rails-4663070d28c9cc63cd349c811249bd5cdf1ec647.tar.bz2 rails-4663070d28c9cc63cd349c811249bd5cdf1ec647.zip | |
move column ordering tests to it's own class
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 4bd3962d3a..10073e2b37 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -610,18 +610,10 @@ module ActiveRecord migrations_paths.first end - def migrations(paths, *args) - if args.empty? - subdirectories = true - else - subdirectories = args.first - ActiveSupport::Deprecation.warn "The `subdirectories` argument to `migrations` is deprecated" - end - + def migrations(paths) paths = Array(paths) - glob = subdirectories ? "**/" : "" - files = Dir[*paths.map { |p| "#{p}/#{glob}[0-9]*_*.rb" }] + files = Dir[*paths.map { |p| "#{p}/**/[0-9]*_*.rb" }] seen = Hash.new false |