data_migrate 6.0.1.beta → 6.0.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82df1d98f4ca46a882e5008667428c15a91fdfb41601df6d1241b9e87cb4e35f
-  data.tar.gz: 81b2c71177397ad31851e998235d2c116ebca7c94c04abdcb3dc6257cfa4ff54
+  metadata.gz: 62ee3cf7421520ff906f2eb711b4af8986e60177d6fb4ec4ea44606b5756ed86
+  data.tar.gz: 8ff0412f9c8d48328289f3a8dcd187ec3a254a7cf59ce598d641e5c880e2d8f4
 SHA512:
-  metadata.gz: 64257b2ed0d1a71caad5b3ef113a1c578e09cbff58e98f304dc6abc1919ae279da186103cb1af9b4d873163365cec76d62d6ba311861a3a7cccb860fc171a707
-  data.tar.gz: 0df8009342ec00db007e572377103057280e70f49076050fb840fcf70aef1fedea5a5e8020bb0000f5eb1de978beb919e536c027609b62a505470f90c15af7c2
+  metadata.gz: 69c7de84ed210feedd61f220fa97538356c500408f4280f97405d4a1a24438f3f6dc4947cc8d4da8827d1427a97f7cc55602ad0069d0412abc1e7ffa88561ae6
+  data.tar.gz: b6c02d4128e90f1a958c35c6a50e30a504f361c91ff0fa3caca28d29f961e5f2b87af46705b4f80ab3e9ac9fe1a66247eb71335de26e462b759f4a7a76d57960

data/Changelog.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 6.0.1
+## 6.0.3.beta
+
+Compatiblity with Rails 6 RC2 [y-yagi](https://github.com/y-yagi)
+
+## 6.0.1.beta
+
 Fix migrations being generated in wrong folder
 
 ## 6.0.0

data/gemfiles/rails_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.0.0.beta3"
+gem "rails", "~> 6.0.0.rc2"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/data_migrate.rb

@@ -14,7 +14,7 @@ require File.join(File.dirname(__FILE__), "data_migrate", "database_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "schema_dumper")
 if Rails::VERSION::MAJOR == 6
   require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")
+  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_six")
 elsif Rails::VERSION::MAJOR == 5 &&  Rails::VERSION::MINOR == 2
   require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
   require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")

data/lib/data_migrate/schema_migration_six.rb

@@ -0,0 +1,31 @@
+module DataMigrate
+  # Helper class to getting access to db schema
+  # to allow data/schema combiation tasks
+  class SchemaMigration
+    def self.pending_schema_migrations
+      all_migrations = DataMigrate::MigrationContext.new(migrations_paths).migrations
+      sort_migrations(
+        ActiveRecord::Migrator.new(:up, all_migrations, ActiveRecord::Base.connection.schema_migration).
+        pending_migrations.
+        map {|m| { version: m.version, kind: :schema }}
+      )
+    end
+
+    def self.run(direction, migration_paths, version)
+      ActiveRecord::MigrationContext.new(migration_paths, ActiveRecord::Base.connection.schema_migration).run(direction, version)
+    end
+
+    def self.sort_migrations(set1, set2 = nil)
+      migrations = set1 + (set2 || [])
+      migrations.sort {|a, b|  sort_string(a) <=> sort_string(b)}
+    end
+
+    def self.migrations_paths
+      Rails.application.config.paths["db/migrate"].to_a
+    end
+
+    def self.sort_string(migration)
+      "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
+    end
+  end
+end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "6.0.1.beta".freeze
+  VERSION = "6.0.3.beta".freeze
 end

data/spec/data_migrate/migration_context_spec.rb

@@ -10,7 +10,7 @@ describe DataMigrate::DataMigrator do
   }
   let(:schema_context) {
     if (Rails::VERSION::MAJOR == 6)
-      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0")
+      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0", ActiveRecord::Base.connection.schema_migration)
     else
       ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 6.0.1.beta
+  version: 6.0.3.beta
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -217,6 +217,7 @@ files:
 - lib/data_migrate/schema_dumper.rb
 - lib/data_migrate/schema_migration.rb
 - lib/data_migrate/schema_migration_five.rb
+- lib/data_migrate/schema_migration_six.rb
 - lib/data_migrate/status_service.rb
 - lib/data_migrate/status_service_five.rb
 - lib/data_migrate/tasks/data_migrate_tasks.rb
@@ -285,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.