data_migrate 9.1.1 → 9.3.0

data/spec/data_migrate/database_tasks_spec.rb

@@ -8,12 +8,6 @@ describe DataMigrate::DatabaseTasks do
   let(:data_migrations_path) {
     DataMigrate.config.data_migrations_path
   }
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
-  end
 
   before do
     # In a normal Rails installation, db_dir would defer to
@@ -27,14 +21,10 @@ describe DataMigrate::DatabaseTasks do
     allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
       data_migrations_path
     }
-    ActiveRecord::Base.establish_connection(db_config)
-    if Gem::Dependency.new("railties", ">= 6.1").match?("railties", Gem.loaded_specs["railties"].version)
-      hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', db_config)
-      config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
-      allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
-    else
-      ActiveRecord::Base.configurations[:test] = db_config
-    end
+    ActiveRecord::Base.establish_connection({ adapter: "sqlite3", database: "spec/db/test.db" })
+    hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', { adapter: "sqlite3", database: "spec/db/test.db" })
+    config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
+    allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
   end
 
   context "migrations" do
@@ -44,7 +34,7 @@ describe DataMigrate::DatabaseTasks do
     end
 
     before do
-      ActiveRecord::SchemaMigration.create_table
+      DataMigrate::RailsHelper.schema_migration.create_table
 
       allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) {
         migration_path
@@ -71,19 +61,45 @@ describe DataMigrate::DatabaseTasks do
     describe :forward do
       it "run forward default amount of times" do
         subject.forward
-        versions = DataMigrate::DataSchemaMigration.normalized_versions
+        versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
         expect(versions.count).to eq(1)
       end
 
       it "run forward defined number of times" do
         subject.forward(2)
-        versions = DataMigrate::DataSchemaMigration.normalized_versions
+        versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
         expect(versions.count).to eq(1)
         expect(versions.first).to eq "20091231235959"
-        versions = ActiveRecord::SchemaMigration.normalized_versions
+        versions = DataMigrate::RailsHelper.schema_migration.normalized_versions
         expect(versions.count).to eq(1)
         expect(versions.first).to eq "20131111111111"
       end
     end
+
+    if DataMigrate::RailsHelper.rails_version_equal_to_or_higher_than_7_0
+      describe :schema_dump_path do
+        before do
+          allow(ActiveRecord::Base).to receive(:configurations).and_return(ActiveRecord::DatabaseConfigurations.new([db_config]))
+        end
+
+        context "for primary database" do
+          let(:db_config) { ActiveRecord::DatabaseConfigurations::HashConfig.new("development", "primary", {} ) }
+
+          context "for :ruby db format" do
+            it 'returns the data schema path' do
+              allow(ActiveRecord).to receive(:schema_format).and_return(:ruby)
+              expect(subject.schema_dump_path(db_config)).to eq("db/data_schema.rb")
+            end
+          end
+
+          context "for :sql db format" do
+            it 'returns the data schema path' do
+              allow(ActiveRecord).to receive(:schema_format).and_return(:sql)
+              expect(subject.schema_dump_path(db_config, :sql)).to eq("db/data_schema.rb")
+            end
+          end
+        end
+      end
+    end
   end
 end

data/spec/data_migrate/migration_context_spec.rb

@@ -5,10 +5,17 @@ require "spec_helper"
 describe DataMigrate::DataMigrator do
   let(:context) { DataMigrate::MigrationContext.new("spec/db/data") }
   let(:schema_context) { ActiveRecord::MigrationContext.new("spec/db/migrate", ActiveRecord::Base.connection.schema_migration) }
+  let(:db_config) do
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
+  end
 
   before do
-    ActiveRecord::SchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create_table
+    ActiveRecord::Base.establish_connection(db_config)
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
   end
 
   after do
@@ -20,7 +27,7 @@ describe DataMigrate::DataMigrator do
     it "migrates existing file" do
       context.migrate(nil)
       context.migrations_status
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(2)
       expect(versions).to include("20091231235959")
       expect(versions).to include("20171231235959")
@@ -29,7 +36,7 @@ describe DataMigrate::DataMigrator do
     it "undo migration" do
       context.migrate(nil)
       context.run(:down, 20171231235959)
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(1)
       expect(versions).to include("20091231235959")
     end
@@ -46,7 +53,7 @@ describe DataMigrate::DataMigrator do
 
     it "runs a specific migration" do
       context.run(:up, 20171231235959)
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(1)
       expect(versions).to include("20171231235959")
     end
@@ -74,7 +81,7 @@ describe DataMigrate::DataMigrator do
       expect {
         context.rollback
       }.to output(/Undoing SuperUpdate/).to_stdout
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(1)
       expect(versions).to include("20091231235959")
     end
@@ -85,7 +92,7 @@ describe DataMigrate::DataMigrator do
       expect {
         context.rollback(2)
       }.to output(/Undoing SomeName/).to_stdout
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(0)
     end
 
@@ -94,7 +101,7 @@ describe DataMigrate::DataMigrator do
       expect {
         context.rollback(2)
       }.to output(/Undoing SomeName/).to_stdout
-      versions = DataMigrate::DataSchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.data_schema_migration.normalized_versions
       expect(versions.count).to eq(0)
     end
   end

data/spec/data_migrate/schema_dumper_spec.rb

@@ -9,9 +9,12 @@ describe DataMigrate::SchemaDumper do
   end
 
   before do
-    ActiveRecord::SchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create(fixture_file_timestamps.map { |t| { version: t } })
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
+
+    fixture_file_timestamps.map do |t|
+      DataMigrate::RailsHelper.data_schema_migration.create_version(t)
+    end
   end
 
   after do

data/spec/data_migrate/schema_migration_spec.rb

@@ -8,10 +8,17 @@ describe DataMigrate::SchemaMigration do
   let(:fixture_file_timestamps) do
     %w[20091231235959 20101231235959 20111231235959]
   end
+  let(:db_config) do
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
+  end
 
   before do
-    ActiveRecord::SchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create_table
+    ActiveRecord::Base.establish_connection(db_config)
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
   end
 
   after do
@@ -38,7 +45,7 @@ describe DataMigrate::SchemaMigration do
       expect {
         subject.run(:up, migration_path, 20202020202011)
       }.to output(/20202020202011 DbMigration: migrating/).to_stdout
-      versions = ActiveRecord::SchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.schema_migration.normalized_versions
       expect(versions.first).to eq("20202020202011")
     end
 
@@ -49,7 +56,7 @@ describe DataMigrate::SchemaMigration do
         subject.run(:down, migration_path, 20202020202011)
       }.to output(/Undoing DbMigration/).to_stdout
 
-      versions = ActiveRecord::SchemaMigration.normalized_versions
+      versions = DataMigrate::RailsHelper.schema_migration.normalized_versions
 
       expect(versions.count).to eq(0)
     end
@@ -61,9 +68,9 @@ describe DataMigrate::SchemaMigration do
       let(:paths) { ['spec/db/migrate', 'spec/db/migrate/other'] }
       let(:specification_name) { "primary" }
       let(:config_options) do
-        if Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
+        if Gem::Dependency.new("railties", "~> 6.1").match?("railties", Gem.loaded_specs["railties"].version)
           { env_name: Rails.env, spec_name: specification_name }
-        elsif Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
+        else
           { env_name: Rails.env, name: specification_name }
         end
       end

data/spec/data_migrate/status_service_spec.rb

@@ -33,9 +33,12 @@ describe DataMigrate::StatusService do
     end
 
     before do
-      ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create(fixture_file_timestamps.map { |t| { version: t } })
+      DataMigrate::RailsHelper.schema_migration.create_table
+      DataMigrate::RailsHelper.data_schema_migration.create_table
+
+      fixture_file_timestamps.map do |t|
+        DataMigrate::RailsHelper.data_schema_migration.create_version(t)
+      end
 
       subject.dump(connection_db_config, stream)
       stream.rewind

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -3,17 +3,17 @@
 require "spec_helper"
 
 describe DataMigrate::Tasks::DataMigrateTasks do
-  let(:connection_db_config) do
-    if Gem::Dependency.new("railties", ">= 6.1").match?("railties", Gem.loaded_specs["railties"].version)
-      ActiveRecord::Base.connection_db_config
-    else
-      ActiveRecord::Base.configurations.configs_for.first
-    end
+  let(:db_config) do
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
   end
 
   before do
-    ActiveRecord::SchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create_table
+    ActiveRecord::Base.establish_connection(db_config)
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
   end
 
   after do

data/spec/db/data/20091231235959_some_name.rb

@@ -1,4 +1,4 @@
-class SomeName < ActiveRecord::Migration[6.0]
+class SomeName < ActiveRecord::Migration[6.1]
   def up
     puts "Doing data migration"
   end

data/spec/db/data/20171231235959_super_update.rb

@@ -1,4 +1,4 @@
-class SuperUpdate < ActiveRecord::Migration[6.0]
+class SuperUpdate < ActiveRecord::Migration[6.1]
   def up
     puts "Doing SuperUpdate"
   end

data/spec/db/migrate/20131111111111_late_migration.rb

@@ -1,4 +1,4 @@
-class LateMigration < ActiveRecord::Migration[6.0]
+class LateMigration < ActiveRecord::Migration[6.1]
   def up
     puts "Doing schema LateMigration"
   end

data/spec/db/migrate/20202020202011_db_migration.rb

@@ -1,4 +1,4 @@
-class DbMigration < ActiveRecord::Migration[6.0]
+class DbMigration < ActiveRecord::Migration[6.1]
   def up
     puts "Doing schema migration"
   end

data/tasks/databases.rake

@@ -7,48 +7,31 @@ namespace :db do
     desc "Migrate the database data and schema (options: VERSION=x, VERBOSE=false)."
     task :with_data => :environment do
       DataMigrate::DataMigrator.create_data_schema_table
-
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-      migrations = []
 
-      if target_version.nil?
-        migrations = DataMigrate::DatabaseTasks.pending_migrations.map{ |m| m.merge(:direction =>:up) }
-      else
-        current_schema_version = ActiveRecord::Migrator.current_version
-        schema_migrations = if target_version > current_schema_version
-                              DataMigrate::DatabaseTasks.pending_schema_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
-                            elsif target_version < current_schema_version
-                              DataMigrate::DatabaseTasks.past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
-                            else # ==
-                              []
-                            end
-
-        current_data_version = DataMigrate::DataMigrator.current_version
-        data_migrations = if target_version > current_data_version
-                            DataMigrate::DatabaseTasks.pending_data_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
-                          elsif target_version < current_data_version
-                            DataMigrate::DatabaseTasks.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
-                       DataMigrate::DatabaseTasks.sort_migrations data_migrations, schema_migrations
-                     elsif target_version < current_data_version && target_version < current_schema_version
-                       DataMigrate::DatabaseTasks.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
+      db_configs = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env)
+
+      schema_mapped_versions = ActiveRecord::Tasks::DatabaseTasks.db_configs_with_versions(db_configs)
+      data_mapped_versions = DataMigrate::DatabaseTasks.db_configs_with_versions
+
+      mapped_versions = schema_mapped_versions.merge(data_mapped_versions) do |_key, schema_db_configs, data_db_configs|
+        schema_db_configs + data_db_configs
       end
 
-      migrations.each do |migration|
-        DataMigrate::DatabaseTasks.run_migration(migration, migration[:direction])
+      mapped_versions.sort.each do |version, db_configs|
+        db_configs.each do |db_config|
+          if is_data_migration = db_config.is_a?(DataMigrate::DatabaseConfigurationWrapper)
+            db_config = db_config.db_config
+          end
+
+          DataMigrate::DatabaseTasks.with_temporary_connection(db_config) do
+            if is_data_migration
+              DataMigrate::DataMigrator.run(:up, DataMigrate::DatabaseTasks.data_migrations_path, version)
+            else
+              ActiveRecord::Tasks::DatabaseTasks.migrate(version)
+            end
+          end
+        end
       end
 
       Rake::Task["db:_dump"].invoke

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.3.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -128,16 +128,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +201,17 @@ files:
 - Appraisals
 - Changelog.md
 - Gemfile
-- Gemfile.rails6.1
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - data_migrate.gemspec
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_6.1.gemfile.lock
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.1.gemfile.lock
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
@@ -216,14 +219,16 @@ files:
 - lib/data_migrate/data_migrator.rb
 - lib/data_migrate/data_schema.rb
 - lib/data_migrate/data_schema_migration.rb
+- lib/data_migrate/database_configurations_wrapper.rb
 - lib/data_migrate/database_tasks.rb
-- lib/data_migrate/legacy_migrator.rb
 - lib/data_migrate/migration_context.rb
+- lib/data_migrate/rails_helper.rb
 - lib/data_migrate/railtie.rb
 - lib/data_migrate/schema_dumper.rb
 - lib/data_migrate/schema_migration.rb
 - lib/data_migrate/status_service.rb
 - lib/data_migrate/tasks/data_migrate_tasks.rb
+- lib/data_migrate/test.rb
 - lib/data_migrate/version.rb
 - lib/generators/data_migrate.rb
 - lib/generators/data_migration/data_migration_generator.rb
@@ -235,7 +240,6 @@ files:
 - spec/data_migrate/data_schema_migration_spec.rb
 - spec/data_migrate/data_spec.rb
 - spec/data_migrate/database_tasks_spec.rb
-- spec/data_migrate/legacy_migrator_spec.rb
 - spec/data_migrate/migration.rb
 - spec/data_migrate/migration_context_spec.rb
 - spec/data_migrate/schema_dumper_spec.rb
@@ -274,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.

data/Gemfile.rails6.1

@@ -1,11 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in data_migrate.gemspec
-%w[
-  activerecord
-  railties
-].each do |rails_gem|
-  gem rails_gem, '~> 6.1.0'
-end
-gem 'sqlite3', "~> 1.4"
-gemspec

data/lib/data_migrate/legacy_migrator.rb

@@ -1,22 +0,0 @@
-module DataMigrate
-  class LegacyMigrator
-    def initialize(migrations_paths = "db/data")
-      @migrations_paths = migrations_paths || "db/data"
-    end
-
-    def migrate
-      dates =
-        DataMigrate::DataMigrator.migrations(@migrations_paths).collect(&:version)
-      legacy = ActiveRecord::SchemaMigration.where(version: dates)
-      legacy.each do |v|
-        begin
-          version = v.version
-          puts "Creating #{version} in data schema"
-          DataMigrate::DataSchemaMigration.create(version: version)
-        rescue ActiveRecord::RecordNotUnique
-          nil
-        end
-      end
-    end
-  end
-end

data/spec/data_migrate/legacy_migrator_spec.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe DataMigrate::LegacyMigrator do
-  let(:context) {
-    DataMigrate::MigrationContext.new("spec/db/data")
-  }
-
-  before do
-    ActiveRecord::SchemaMigration.create_table
-    DataMigrate::DataSchemaMigration.create_table
-  end
-
-  after do
-    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
-    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
-  end
-
-  it "migrate legacy migrations to be in correct table" do
-    # simulate creation of legacy data migration when
-    # it was recorded in schema table
-    ActiveRecord::SchemaMigration.create(version: "20091231235959")
-
-    # create one migration in correct place
-    DataMigrate::DataSchemaMigration.create(version: "20171231235959")
-
-    migrated = DataMigrate::DataMigrator.new(:up, []).load_migrated
-    expect(migrated.count).to eq 1
-
-    DataMigrate::LegacyMigrator.new("spec/db/data").migrate
-
-    # after migacy migrator has been run, we should have records
-    # of both migrations
-    migrated = DataMigrate::DataMigrator .new(:up, []).load_migrated
-    expect(migrated.count).to eq 2
-  end
-end