data_migrate 8.5.0 → 9.2.0

data/spec/data_migrate/schema_migration_spec.rb

@@ -3,32 +3,27 @@
 require "spec_helper"
 
 describe DataMigrate::SchemaMigration do
-  let(:migration_path) {
-    if Rails::VERSION::MAJOR == 5
-      "spec/db/migrate/5.2"
-    else
-      "spec/db/migrate/6.0"
-    end
-  }
-
   let(:subject) { DataMigrate::SchemaMigration }
+  let(:migration_path) { "spec/db/migrate" }
+  let(:fixture_file_timestamps) do
+    %w[20091231235959 20101231235959 20111231235959]
+  end
   let(:db_config) do
     {
       adapter: "sqlite3",
       database: "spec/db/test.db"
     }
   end
-  let(:fixture_file_timestamps) do
-    %w[20091231235959 20101231235959 20111231235959]
-  end
 
   before do
     ActiveRecord::Base.establish_connection(db_config)
-    ActiveRecord::SchemaMigration.create_table
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
   end
 
   after do
-    ActiveRecord::Migration.drop_table("schema_migrations")
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
   end
 
   describe :pending_schema_migrations do
@@ -36,6 +31,7 @@ describe DataMigrate::SchemaMigration do
       expect(subject).to receive(:migrations_paths) {
         migration_path
       }
+
       migrations = subject.pending_schema_migrations
 
       expect(migrations.count).to eq 2
@@ -45,55 +41,64 @@ describe DataMigrate::SchemaMigration do
   end
 
   describe :run do
-    it do
+    it "can run up task" 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
 
-    it "undo migration" do
+    it "can run down task" do
       subject.run(:up, migration_path, 20202020202011)
+
       expect {
         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
   end
 
-  if Rails.version > '6'
-    describe :migrations_paths do
-      context 'when a db_name is configured' do
-        let(:config) { double(:config) }
-        let(:paths) { ['spec/db/migrate/6.0', 'spec/db/components/migrate/6.0'] }
-        let(:config_options) do
-          if Rails.version > '6.1'
-            { env_name: 'test', name: 'primary' }
-          else
-            { env_name: 'test', spec_name: 'primary' }
-          end
+  describe :migrations_paths do
+    context 'when a db_name is configured' do
+      let(:config) { double(:config) }
+      let(:paths) { ['spec/db/migrate', 'spec/db/migrate/other'] }
+      let(:specification_name) { "primary" }
+      let(:config_options) do
+        if Gem::Dependency.new("railties", "~> 6.1").match?("railties", Gem.loaded_specs["railties"].version)
+          { env_name: Rails.env, spec_name: specification_name }
+        else
+          { env_name: Rails.env, name: specification_name }
         end
+      end
 
-        before do
-          DataMigrate.configure do |config|
-            config.spec_name = 'primary'
-          end
-
-          allow(ActiveRecord::Base.configurations)
-            .to receive(:configs_for)
-            .with(config_options)
-            .and_return(config)
+      before do
+        @original_config_spec_name = DataMigrate.config.spec_name
 
-          allow(config).to receive(:migrations_paths).and_return(paths)
+        DataMigrate.configure do |config|
+          config.spec_name = specification_name
         end
 
-        it 'lists schema migration paths' do
-          expect(subject.migrations_paths.size).to eq(2)
-          expect(subject.migrations_paths).to eq(paths)
+        allow(ActiveRecord::Base.configurations)
+          .to receive(:configs_for)
+          .with(config_options)
+          .and_return(config)
+        allow(config).to receive(:migrations_paths).and_return(paths)
+      end
+
+      after do
+        DataMigrate.configure do |config|
+          config.spec_name = @original_config_spec_name
         end
       end
+
+      it 'lists schema migration paths' do
+        expect(subject.migrations_paths.size).to eq(paths.count)
+        expect(subject.migrations_paths).to eq(paths)
+      end
     end
   end
 end

data/spec/data_migrate/status_service_spec.rb

@@ -1,30 +1,29 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::StatusService do
-  let(:subject) { DataMigrate::SchemaDumper }
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
+  let(:subject) { DataMigrate::StatusService }
+  let(:stream) { StringIO.new }
+  let(:stream_data) { stream.read }
+  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
   end
-  let(:service) { DataMigrate::StatusService }
 
   context "table does not exists" do
     before do
-      ActiveRecord::Base.establish_connection(db_config)
+      allow_any_instance_of(subject).to receive(:table_name) { "bogus"}
+
+      subject.dump(connection_db_config, stream)
+      stream.rewind
     end
 
     it "show error message" do
-      allow_any_instance_of(service).to receive(:table_name) { "bogus"}
-      stream = StringIO.new
-
-      service.dump(ActiveRecord::Base.connection, stream)
-
-      stream.rewind
-      expected = "Data migrations table does not exist"
-      expect(stream.read).to include expected
+      expect(stream_data).to include("Data migrations table does not exist")
     end
   end
 
@@ -34,69 +33,44 @@ describe DataMigrate::StatusService do
     end
 
     before do
-      allow(DataMigrate::DataMigrator).
-        to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
+      DataMigrate::RailsHelper.schema_migration.create_table
+      DataMigrate::RailsHelper.data_schema_migration.create_table
 
-      ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataMigrator.assure_data_schema_table
+      fixture_file_timestamps.map do |t|
+        DataMigrate::RailsHelper.data_schema_migration.create_version(t)
+      end
 
-      ActiveRecord::Base.connection.execute <<-SQL
-        INSERT INTO #{DataMigrate::DataSchemaMigration.table_name}
-        VALUES #{fixture_file_timestamps.map { |t| "(#{t})" }.join(', ')}
-      SQL
-
-      allow_any_instance_of(service).to receive(:root_folder) { "./" }
+      subject.dump(connection_db_config, stream)
+      stream.rewind
     end
 
     after do
-      ActiveRecord::Migration.drop_table("data_migrations")
+      ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+      ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
     end
 
     it "shows successfully executed migration" do
-      stream = StringIO.new
-      service.dump(ActiveRecord::Base.connection, stream)
-      stream.rewind
-
       expected = "   up     20091231235959  Some name"
-      expect(stream.read).to include expected
+      expect(stream_data).to include expected
     end
 
     it "excludes files without .rb extension" do
-      stream = StringIO.new
-      service.dump(ActiveRecord::Base.connection, stream)
-      stream.rewind
-
       expected = "20181128000207  Excluded file"
-      expect(stream.read).to_not include expected
+      expect(stream_data).to_not include expected
     end
 
     it "shows missing file migration" do
-      stream = StringIO.new
-      service.dump(ActiveRecord::Base.connection, stream)
-      stream.rewind
-
       expected = "   up     20101231235959  ********** NO FILE **********"
-      s = stream.read
-      expect(s).to include expected
+      expect(stream_data).to include expected
     end
 
     it "shows migration that has not run yet" do
-      stream = StringIO.new
-      service.dump(ActiveRecord::Base.connection, stream)
-      stream.rewind
-
       expected = "  down    20171231235959  Super update"
-      s = stream.read
-      expect(s).to include expected
+      expect(stream_data).to include expected
     end
 
     it "outputs migrations in chronological order" do
-      stream = StringIO.new
-      service.dump(ActiveRecord::Base.connection, stream)
-      stream.rewind
-      s = stream.read
-      expect(s.index("20091231235959")).to be < s.index("20111231235959")
+      expect(stream_data.index("20091231235959")).to be < stream_data.index("20111231235959")
     end
   end
 end

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -3,33 +3,40 @@
 require "spec_helper"
 
 describe DataMigrate::Tasks::DataMigrateTasks do
-  describe :dump do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/other_test.db"
-      }
-    end
+  let(:db_config) do
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
+  end
+
+  before do
+    ActiveRecord::Base.establish_connection(db_config)
+    DataMigrate::RailsHelper.schema_migration.create_table
+    DataMigrate::RailsHelper.data_schema_migration.create_table
+  end
+
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
+  end
 
+  describe :dump do
     before do
-      allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
       allow(DataMigrate::DatabaseTasks).to receive(:db_dir).and_return("spec/db")
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
+      DataMigrate::Tasks::DataMigrateTasks.migrate
     end
 
     context 'when not given a separate db config' do
       it 'does not override the default connection' do
-        DataMigrate::Tasks::DataMigrateTasks.migrate
         expect(ActiveRecord::Base).not_to receive(:establish_connection)
         expect(DataMigrate::SchemaDumper).to receive(:dump)
+
         DataMigrate::Tasks::DataMigrateTasks.dump
       end
     end
 
-    context 'when given ' do
+    context 'when given a separate db config' do
       let(:override_config) do
         {
           'host' => '127.0.0.1',
@@ -39,6 +46,7 @@ describe DataMigrate::Tasks::DataMigrateTasks do
           'password' => nil,
         }
       end
+      let(:paths) { ["spec/db/migrate"] }
 
       before do
         DataMigrate.configure do |config|
@@ -47,7 +55,6 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       end
 
       it 'overrides the default connection' do
-        DataMigrate::Tasks::DataMigrateTasks.migrate
         expect(ActiveRecord::Base).to receive(:establish_connection).with(override_config)
         DataMigrate::Tasks::DataMigrateTasks.dump
       end
@@ -55,32 +62,12 @@ describe DataMigrate::Tasks::DataMigrateTasks do
   end
 
   describe :migrate do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/test.db"
-      }
-    end
-
-    before do
-      allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
-      ActiveRecord::Base.establish_connection(db_config)
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
+    it "first run should run the first pending migration" do
+      expect { DataMigrate::Tasks::DataMigrateTasks.migrate }.to output(/20091231235959 SomeName: migrating/).to_stdout
     end
 
-    it do
-       expect {
-        DataMigrate::Tasks::DataMigrateTasks.migrate
-       }.to output(/20091231235959 SomeName: migrating/).to_stdout
-    end
-
-    it do
-      expect {
-        DataMigrate::Tasks::DataMigrateTasks.migrate
-      }.to output(/20171231235959 SuperUpdate: migrating/).to_stdout
+    it "second run should run the second pending migration" do
+      expect { DataMigrate::Tasks::DataMigrateTasks.migrate }.to output(/20171231235959 SuperUpdate: migrating/).to_stdout
     end
   end
 
@@ -111,43 +98,21 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       it "should abort with given message and print names and versions of pending migrations" do
         expect { subject }
           .to raise_error(SystemExit, message)
-          .and output("You have 2 pending migrations:\n     1 A\n     2 B\n").to_stdout
+          .and output(match(/You have #{migrations.count} pending migrations:/)
+          .and match(Regexp.new(migrations.map { |m| m.slice(:version, :name)
+          .values.join("\\W+") }.join("\\W+")))).to_stdout
       end
     end
   end
 
-  describe :status do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/test.db"
-      }
-    end
-
+  describe ".status" do
     before do
-      if Rails::VERSION::MAJOR == 5
-        ActiveRecord::Base.configurations['test'] = db_config
-      else
-        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)
-      end
-
-      allow(Rails).to receive(:root) { '.' }
-
-      if Rails::VERSION::MAJOR == 5
-        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/5.2' }
-      else
-        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/6.0' }
-      end
+      allow(Rails).to receive(:root) { "." }
+      allow(Rails).to receive(:application) { OpenStruct.new(config: OpenStruct.new(paths: { "db/migrate" => ["spec/db/migrate"] })) }
 
       DataMigrate::Tasks::DataMigrateTasks.migrate
     end
 
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-    end
-
     it "should display data migration status" do
       expect {
         DataMigrate::Tasks::DataMigrateTasks.status

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

@@ -1,4 +1,4 @@
-class SomeName < ActiveRecord::Migration[5.2]
+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[5.2]
+class SuperUpdate < ActiveRecord::Migration[6.1]
   def up
     puts "Doing SuperUpdate"
   end

data/spec/db/migrate/{5.2/20131111111111_late_migration.rb → 20131111111111_late_migration.rb}

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

data/spec/db/migrate/{6.0/20202020202011_db_migration.rb → 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/spec/spec_helper.rb

@@ -20,14 +20,8 @@ RSpec.configure do |config|
     if example.metadata[:no_override]
     else
       @prev_data_migrations_path = DataMigrate.config.data_migrations_path
-      if Rails::VERSION::MAJOR == 5
-        DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/data"
-        end
-      else
-        DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/6.0"
-        end
+      DataMigrate.configure do |config|
+        config.data_migrations_path = "spec/db/data"
       end
     end
   end

data/tasks/databases.rake

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'data_migrate/tasks/data_migrate_tasks'
 
 namespace :db do
   namespace :migrate do
     desc "Migrate the database data and schema (options: VERSION=x, VERBOSE=false)."
     task :with_data => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
 
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
@@ -56,7 +58,7 @@ namespace :db do
     namespace :redo do
       desc 'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
       task :with_data => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         if ENV["VERSION"]
           Rake::Task["db:migrate:down:with_data"].invoke
           Rake::Task["db:migrate:up:with_data"].invoke
@@ -72,7 +74,7 @@ namespace :db do
       task :with_data => :environment do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         raise "VERSION is required" unless version
-        DataMigrate::DataMigrator.assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         run_both = ENV["BOTH"] == "true"
         migrations = DataMigrate::DatabaseTasks.pending_migrations.keep_if{|m| m[:version] == version}
 
@@ -94,7 +96,7 @@ namespace :db do
       task :with_data => :environment do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         raise "VERSION is required" unless version
-        DataMigrate::DataMigrator.assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         run_both = ENV["BOTH"] == "true"
         migrations = DataMigrate::DatabaseTasks.past_migrations.keep_if{|m| m[:version] == version}
 
@@ -123,7 +125,7 @@ namespace :db do
     desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
     task :with_data => :environment do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       DataMigrate::DatabaseTasks.past_migrations[0..(step - 1)].each do | past_migration |
         DataMigrate::DatabaseTasks.run_migration(past_migration, :down)
       end
@@ -136,7 +138,7 @@ namespace :db do
   namespace :forward do
     desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
     task :with_data => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       DataMigrate::DatabaseTasks.forward(step)
       Rake::Task["db:_dump"].invoke
@@ -147,7 +149,7 @@ namespace :db do
   namespace :version do
     desc "Retrieves the current schema version numbers for data and schema migrations"
     task :with_data => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       puts "Current Schema version: #{ActiveRecord::Migrator.current_version}"
       puts "Current Data version: #{DataMigrate::DataMigrator.current_version}"
     end
@@ -200,7 +202,7 @@ namespace :data do
   namespace :migrate do
     desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
     task :redo => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       if ENV["VERSION"]
         Rake::Task["data:migrate:down"].invoke
         Rake::Task["data:migrate:up"].invoke
@@ -212,7 +214,7 @@ namespace :data do
 
     desc 'Runs the "up" for a given migration VERSION.'
     task :up => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
       DataMigrate::DataMigrator.run(:up, DataMigrate::DatabaseTasks.data_migrations_path, version)
@@ -223,7 +225,7 @@ namespace :data do
     task :down => :environment do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       DataMigrate::DataMigrator.run(:down, DataMigrate::DatabaseTasks.data_migrations_path, version)
       Rake::Task["data:dump"].invoke
     end
@@ -236,7 +238,7 @@ namespace :data do
 
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
   task :rollback => :environment do
-    DataMigrate::DataMigrator.assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     DataMigrate::DataMigrator.rollback(DataMigrate::DatabaseTasks.data_migrations_path, step)
     Rake::Task["data:dump"].invoke
@@ -244,7 +246,7 @@ namespace :data do
 
   desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
   task :forward => :environment do
-    DataMigrate::DataMigrator.assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     # TODO: No worky for .forward
     # DataMigrate::DataMigrator.forward('db/data/', step)
@@ -257,7 +259,7 @@ namespace :data do
 
   desc "Retrieves the current schema version number for data migrations"
   task :version => :environment do
-    DataMigrate::DataMigrator.assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     puts "Current data version: #{DataMigrate::DataMigrator.current_version}"
   end