Get schema migrations from one place (#179)

* Use normal way to get schema migrations

* whitespace

* Bump version

* Update changelog

Changelog.md

@@ -1,9 +1,11 @@
 # Changelog
+## 7.0.1
+Use SchemaMigrations.migration_paths in main rake task [lewhit](https://github.com/lewhit)
 
 ## 6.8.0
 
 Specify database name for migrations_paths [lewhit](https://github.com/lewhit)
-# 6.7.0
+## 6.7.0
 
 Add configuration for which database name is to be used for database migrations [lewhit](https://github.com/lewhit)
 Add tests for Rails 6.1 [lewhit](https://github.com/lewhit)

lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "7.0.0".freeze
+  VERSION = "7.0.1".freeze
 end

tasks/databases.rake

@@ -46,17 +46,7 @@ namespace :db do
       end
 
       migrations.each do |migration|
-        if migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(migration[:direction], data_migrations_path, migration[:version])
-        else
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(
-            migration[:direction],
-            Rails.application.config.paths["db/migrate"],
-            migration[:version]
-          )
-        end
+        run_migration(migration, migration[:direction])
       end
 
       Rake::Task["db:_dump"].invoke
@@ -91,13 +81,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:up, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:up, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :up)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -119,13 +103,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:down, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:down, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :down)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -189,13 +167,7 @@ namespace :db do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       assure_data_schema_table
       past_migrations[0..(step - 1)].each do | past_migration |
-        if past_migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(:down, data_migrations_path, past_migration[:version])
-        elsif past_migration[:kind] == :schema
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(:down, "db/migrate/", past_migration[:version])
-        end
+        run_migration(past_migration, :down)
       end
 
       Rake::Task["db:_dump"].invoke
@@ -412,3 +384,17 @@ end
 def data_migrations_path
   DataMigrate.config.data_migrations_path
 end
+
+def run_migration(migration, direction)
+  if migration[:kind] == :data
+    ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
+    DataMigrate::DataMigrator.run(direction, data_migrations_path, migration[:version])
+  else
+    ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
+    DataMigrate::SchemaMigration.run(
+      direction,
+      DataMigrate::SchemaMigration.migrations_paths,
+      migration[:version]
+    )
+  end
+end