data_migrate 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd1c0cc04a76e4332a3af19199beab36e329ecb2af1ab8d0fd706d0457e6f93
-  data.tar.gz: 1431e365d30537f284039aa1dd6dd7db12b24f9ec845fc3d0d3448adbec70c1c
+  metadata.gz: eb3b56bd9d4670d332c63569b1744e1bb98af5f2f492ba3df0d4b80a5bdb7f7d
+  data.tar.gz: '08fe1b1769bf9c021aa2896e733d98100034d934e6a27492f6e455ad3f7475dd'
 SHA512:
-  metadata.gz: c46327a2feee44ac29106baefa254204ce4adfa914e849ae0f63c6b617369ad3c4c00b0ece39f94137b5df2547ceecf73f8d3716539b38476467cac11b9ce664
-  data.tar.gz: d635f7561555a22a3695f60bfcb51eeb93ed89cce158abaeba78f373dbb37746be42ff94fb9277f65d48964887cde7587e215bbda3ee565f3c3aee3e40af6d46
+  metadata.gz: 1d84302907054176f07464c0c4ec0f2340d43e90305477fb0da6dac29a597287628f26882590168c4bd8e2d376deacbde53d27e8e5458a6dbe0970f275462886
+  data.tar.gz: 055f2fe4fea33cc47d64976bd5c5f630099e0be193a7b01f01f76f4e272de20bdc43b5e6ba2de2888a1a60643ad4947af03dfa71190cb5b1812550eab9a95e1b

data/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)

data/lib/data_migrate/version.rb

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

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord