cleanup task logic more

[grosser]

@ndbroadbent looks good ?

[ndbroadbent]

@grosser That looks good! I think there's a bug with the task_name variable, but I think it is better to be more explicit. Maybe something like this?

  desc "Update test databases by dumping and loading --> parallel:prepare[num_cpus]"
  task(:prepare, [:count]) do |_,args|
    ParallelTests::Tasks.check_for_pending_migrations
    if defined?(ActiveRecord::Base) && [:ruby, :sql].include?(ActiveRecord::Base.schema_format)
      # fast: dump once, load in parallel
      case ActiveRecord::Base.schema_format
      when :ruby
        Rake::Task["db:schema:dump"].invoke
        ActiveRecord::Base.remove_connection if ActiveRecord::Base.configurations.any?
        Rake::Task["parallel:load_schema"].invoke(args[:count])
      when :sql
        Rake::Task["db:structure:dump"].invoke
        ActiveRecord::Base.remove_connection if ActiveRecord::Base.configurations.any?
        Rake::Task["parallel:load_structure"].invoke(args[:count])
      end
    else
      # slow: dump and load in in serial
      args = args.to_hash.merge(:non_parallel => true) # normal merge returns nil
      task_name = Rake::Task.task_defined?('db:test:prepare') ? 'db:test:prepare' : 'app:db:test:prepare'
      ParallelTests::Tasks.run_in_parallel("#{ParallelTests::Tasks.rake_bin} #{task_name}", args)
    end
  end

[ndbroadbent]

task_name is used here, so this will become: Rake::Task["db:parallel:load_schema:dump"].invoke

[grosser]

2.30.0