Permalink
Browse files

db:migrate:status correctly uses ActiveRecord::Migrator.migrations_pa…

…ths instead of only the apps db/migrate directory, which will include engine migrations.
  • Loading branch information...
1 parent 5ed3e6a commit dffd058c6942bed8c837404056ff5c410045da86 @joelmoss joelmoss committed Sep 8, 2011
Showing with 7 additions and 5 deletions.
  1. +7 −5 activerecord/lib/active_record/railties/databases.rake
@@ -203,11 +203,13 @@ db_namespace = namespace :db do
end
db_list = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
file_list = []
- Dir.foreach(File.join(Rails.root, 'db', 'migrate')) do |file|
- # only files matching "20091231235959_some_name.rb" pattern
- if match_data = /^(\d{14})_(.+)\.rb$/.match(file)
- status = db_list.delete(match_data[1]) ? 'up' : 'down'
- file_list << [status, match_data[1], match_data[2].humanize]
+ ActiveRecord::Migrator.migrations_paths.each do |path|
+ Dir.foreach(path) do |file|
+ # only files matching "20091231235959_some_name.rb" pattern
+ if match_data = /^(\d{14})_(.+)\.rb$/.match(file)
+ status = db_list.delete(match_data[1]) ? 'up' : 'down'
+ file_list << [status, match_data[1], match_data[2].humanize]
+ end
end
end
db_list.map! do |version|

0 comments on commit dffd058

Please sign in to comment.