aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/schema.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-12-03 13:12:59 +0100
committerPiotr Sarnacki <drogus@gmail.com>2010-12-09 00:04:36 +0100
commitd0467e08e54a84fc4672c508716615aa0177994a (patch)
tree2c5600d38641129ebe14da2c8fe5da26736cbb70 /activerecord/lib/active_record/schema.rb
parente924814b28d655242a49f543cf453d55712071b1 (diff)
downloadrails-d0467e08e54a84fc4672c508716615aa0177994a.tar.gz
rails-d0467e08e54a84fc4672c508716615aa0177994a.tar.bz2
rails-d0467e08e54a84fc4672c508716615aa0177994a.zip
Allow to run migrations from more than one directory
Diffstat (limited to 'activerecord/lib/active_record/schema.rb')
-rw-r--r--activerecord/lib/active_record/schema.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb
index c6bb5c1961..d815ab05ac 100644
--- a/activerecord/lib/active_record/schema.rb
+++ b/activerecord/lib/active_record/schema.rb
@@ -30,8 +30,8 @@ module ActiveRecord
# ActiveRecord::Schema is only supported by database adapters that also
# support migrations, the two features being very similar.
class Schema < Migration
- def migrations_path
- ActiveRecord::Migrator.migrations_path
+ def migrations_paths
+ ActiveRecord::Migrator.migrations_paths
end
# Eval the given block. All methods available to the current connection
@@ -51,7 +51,7 @@ module ActiveRecord
unless info[:version].blank?
initialize_schema_migrations_table
- assume_migrated_upto_version(info[:version], schema.migrations_path)
+ assume_migrated_upto_version(info[:version], schema.migrations_paths)
end
end
end