diff options
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index c57a637a34..4bd3962d3a 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,5 +1,6 @@ require "active_support/core_ext/module/delegation" require "active_support/core_ext/class/attribute_accessors" +require 'active_support/deprecation' module ActiveRecord # Exception that can be raised to stop migrations from going backwards. @@ -523,7 +524,7 @@ module ActiveRecord File.basename(filename) end - delegate :migrate, :announce, :write, :to=>:migration + delegate :migrate, :announce, :write, :to => :migration private @@ -609,7 +610,14 @@ module ActiveRecord migrations_paths.first end - def migrations(paths, subdirectories = true) + def migrations(paths, *args) + if args.empty? + subdirectories = true + else + subdirectories = args.first + ActiveSupport::Deprecation.warn "The `subdirectories` argument to `migrations` is deprecated" + end + paths = Array(paths) glob = subdirectories ? "**/" : "" |