Wrong value for current_data_version in db:migrate:with_data?

[sully7]

In the blob:

data-migrate/tasks/databases.rake

Lines 13 to 46 in 1db042b

	if target_version.nil?
	migrations = pending_migrations.map{ |m| m.merge(:direction =>:up) }
	else
	current_schema_version = ActiveRecord::Migrator.current_version
	schema_migrations = if target_version > current_schema_version
	pending_schema_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
	elsif target_version < current_schema_version
	past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
	else # ==
	[]
	end
	current_data_version = ActiveRecord::Migrator.current_version
	data_migrations = if target_version > current_data_version
	pending_data_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
	elsif target_version < current_data_version
	past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
	else # ==
	[]
	end
	migrations = if schema_migrations.empty?
	data_migrations
	elsif data_migrations.empty?
	schema_migrations
	elsif target_version > current_data_version && target_version > current_schema_version
	sort_migrations data_migrations, schema_migrations
	elsif target_version < current_data_version && target_version < current_schema_version
	sort_migrations(data_migrations, schema_migrations).reverse
	elsif target_version > current_data_version && target_version < current_schema_version
	schema_migrations + data_migrations
	elsif target_version < current_data_version && target_version > current_schema_version
	schema_migrations + data_migrations
	end
	end

The following variables are currently assigned to the same value:

data-migrate/tasks/databases.rake

Line 16 in 1db042b

current_schema_version = ActiveRecord::Migrator.current_version

data-migrate/tasks/databases.rake

Line 25 in 1db042b

current_data_version = ActiveRecord::Migrator.current_version

I think Line 25 is instead supposed to read

current_data_version = DataMigrate::DataMigrator.current_version

Haven't gone through testing yet, but wanted to see if anyone else thought this was incorrect?

[ilyakatz]

hi @sully7 thanks for this as well. a few major versions ago, there was a lot more reliance directly on ActiveRecord::Migrator, i later introduced DataMigrate::DataMigrator so this sounds like this is correct change. To be honest, I haven't worked with rails (and this gem) for over 2 years so i'd appreciate if you could test it out a bit. Let me know if you need anything else from me