From 4663070d28c9cc63cd349c811249bd5cdf1ec647 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 10 Jan 2012 14:02:21 -0800
Subject: move column ordering tests to it's own class

---
 activerecord/lib/active_record/migration.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'activerecord/lib/active_record')

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
 
-- 
cgit v1.2.3