Merge branch '2-3-stable' of github.com:rails/rails into 2-3-stable

activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -336,12 +336,12 @@ module ActiveRecord
         end
       end
 
-      def assume_migrated_upto_version(version)
+      def assume_migrated_upto_version(version, migrations_path = ActiveRecord::Migrator.migrations_path)
         version = version.to_i
         sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
 
         migrated = select_values("SELECT version FROM #{sm_table}").map(&:to_i)
-        versions = Dir['db/migrate/[0-9]*_*.rb'].map do |filename|
+        versions = Dir["#{migrations_path}/[0-9]*_*.rb"].map do |filename|
           filename.split('/').last.split('_').first.to_i
         end
 

activerecord/lib/active_record/migration.rb

@@ -408,6 +408,10 @@ module ActiveRecord
         self.new(direction, migrations_path, target_version).run
       end
 
+      def migrations_path
+        'db/migrate'
+      end
+
       def schema_migrations_table_name
         Base.table_name_prefix + 'schema_migrations' + Base.table_name_suffix
       end

activerecord/lib/active_record/schema.rb

@@ -28,6 +28,10 @@ module ActiveRecord
   class Schema < Migration
     private_class_method :new
 
+    def self.migrations_path
+      ActiveRecord::Migrator.migrations_path
+    end
+
     # Eval the given block. All methods available to the current connection
     # adapter are available within the block, so you can easily use the
     # database definition DSL to build up your schema (+create_table+,
@@ -44,7 +48,7 @@ module ActiveRecord
 
       unless info[:version].blank?
         initialize_schema_migrations_table
-        assume_migrated_upto_version info[:version]
+        assume_migrated_upto_version(info[:version], migrations_path)
       end
     end
   end