diff options
author | Christopher Wade <wade.christopher@gmail.com> | 2011-04-30 01:11:23 -0500 |
---|---|---|
committer | Christopher Wade <wade.christopher@gmail.com> | 2011-05-09 01:46:35 -0500 |
commit | e585121539b4f0f311023068b0a7543b3ae14a2d (patch) | |
tree | ee7700a52a4f9e3988b711e2efc3d32a3264344f /activerecord | |
parent | 2952040f7079669e6a55e7ffab167c2c7ff99afe (diff) | |
download | rails-e585121539b4f0f311023068b0a7543b3ae14a2d.tar.gz rails-e585121539b4f0f311023068b0a7543b3ae14a2d.tar.bz2 rails-e585121539b4f0f311023068b0a7543b3ae14a2d.zip |
Interleave db_list and file_list.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index a71bffd580..85ad43b35f 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -203,18 +203,18 @@ db_namespace = namespace :db do # 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]] + file_list << [status, match_data[1], match_data[2].humanize] end end + db_list.map! do |version| + ['up', version, '********** NO FILE **********'] + end # output puts "\ndatabase: #{config['database']}\n\n" puts "#{'Status'.center(8)} #{'Migration ID'.ljust(14)} Migration Name" puts "-" * 50 - file_list.sort_by {|file| file[1]}.each do |file| - puts "#{file[0].center(8)} #{file[1].ljust(14)} #{file[2].humanize}" - end - db_list.sort.each do |version| - puts "#{'up'.center(8)} #{version.ljust(14)} *** NO FILE ***" + (db_list + file_list).sort_by {|migration| migration[1]}.each do |migration| + puts "#{migration[0].center(8)} #{migration[1].ljust(14)} #{migration[2]}" end puts end |