diff --git a/lib/data_migrate/tasks/data_migrate_tasks.rb b/lib/data_migrate/tasks/data_migrate_tasks.rb index b6e88ad7..a503d73a 100644 --- a/lib/data_migrate/tasks/data_migrate_tasks.rb +++ b/lib/data_migrate/tasks/data_migrate_tasks.rb @@ -44,12 +44,11 @@ def dump_schema_after_migration? end end - def status(db_config) - puts "\ndatabase: #{spec_name(db_config)}\n\n" - DataMigrate::StatusService.dump(ActiveRecord::Base.connection) + def status + DataMigrate::StatusService.dump end - def status_with_schema(db_config) + def status_with_schema db_list_data = ActiveRecord::Base.connection.select_values( "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}" ) @@ -77,7 +76,7 @@ def status_with_schema(db_config) file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" } # output - puts "\ndatabase: #{spec_name(db_config)}\n\n" + puts "\ndatabase: #{ActiveRecord::Base.connection.pool.db_config.database}\n\n" puts "#{"Status".center(8)} #{"Type".center(8)} #{"Migration ID".ljust(14)} Migration Name" puts "-" * 60 file_list.each do |file| @@ -91,16 +90,6 @@ def status_with_schema(db_config) end puts end - - private - - def spec_name(db_config) - if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version) - db_config.name - elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version) - db_config.spec_name - end - end end end end diff --git a/spec/data_migrate/tasks/data_migrate_tasks_spec.rb b/spec/data_migrate/tasks/data_migrate_tasks_spec.rb index 600cc3b6..50792d95 100644 --- a/spec/data_migrate/tasks/data_migrate_tasks_spec.rb +++ b/spec/data_migrate/tasks/data_migrate_tasks_spec.rb @@ -115,13 +115,13 @@ it "should display data migration status" do expect { - DataMigrate::Tasks::DataMigrateTasks.status(connection_db_config) + DataMigrate::Tasks::DataMigrateTasks.status }.to output(/up 20091231235959 Some name/).to_stdout end it "should display schema and data migration status" do expect { - DataMigrate::Tasks::DataMigrateTasks.status_with_schema(connection_db_config) + DataMigrate::Tasks::DataMigrateTasks.status_with_schema }.to output(match(/up data 20091231235959 Some name/) .and match(/down schema 20131111111111 Late migration/)).to_stdout end