From 68b7e7ab9776d26d69bc84037ba81c68dd38885b Mon Sep 17 00:00:00 2001 From: Viktar Basharymau Date: Fri, 27 Jun 2014 20:16:21 +0300 Subject: Extract AR::SchemaMigration.normalized_versions method --- activerecord/lib/active_record/railties/databases.rake | 3 +-- activerecord/lib/active_record/schema_migration.rb | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index c82a56718a..d7621646d9 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -96,8 +96,7 @@ db_namespace = namespace :db do unless ActiveRecord::Base.connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name) abort 'Schema migrations table does not exist yet.' end - db_list = ActiveRecord::SchemaMigration.pluck(:version) - db_list.map! { |version| ActiveRecord::SchemaMigration.normalize_migration_number(version) } + db_list = ActiveRecord::SchemaMigration.normalized_versions file_list = ActiveRecord::Migrator.migrations_paths.flat_map do |path| diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb index 3a004d58c9..b5038104ac 100644 --- a/activerecord/lib/active_record/schema_migration.rb +++ b/activerecord/lib/active_record/schema_migration.rb @@ -43,6 +43,10 @@ module ActiveRecord def normalize_migration_number(number) "%.3d" % number.to_i end + + def normalized_versions + pluck(:version).map { |v| normalize_migration_number v } + end end def version -- cgit v1.2.3