data_migrate 8.5.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ed214d2b242e9802276616e52abc79dc40081b413f6c38cdcbc5414d5897e9
-  data.tar.gz: f4045cba836825fa34a0da775d38999ea472f2fb8624537e8ffc216f01204e85
+  metadata.gz: e439cb5180eca3cf1195560f8942178ac4ca64304489f1ec3ce3b1efa3462be4
+  data.tar.gz: efe9f8166f6fd7080d68b6dc050ac63124528d66ccc0465a505cd1002bbd7dce
 SHA512:
-  metadata.gz: c98becc1b27f1afc98a8e45c4c81ea35195a992f2ff7433d8891b542cc05063dde7ffd1655ba521e14e700e477acc23345b15a893e2a900c508fc0b72c69302c
-  data.tar.gz: 04560cc96cf6696b032b7a9d6892d70b772801b62910899ea2c360d7a17b98e8ab58bcd535e9a1fbdd40aa07c8633e92f5f52db8f9a6340c00788919eb5acf5b
+  metadata.gz: 64ca4079825785ca93b6e636a62b9117d15e5b6e10c667467657b229833014286e3339c644360f5ffa1ddab83bafca3dbff0397e5b1ecaa75eb646fe87b637d0
+  data.tar.gz: c9dced4b2efe056e2519ad8493c2d25a165d122f6350569a191b182d8d6f6e189f40fbff744f1b31039810636cd603b18363618080b4eb502570e1943828631d

data/.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu-20.04" ]
+        ruby:
+          - '3.0'
+          - '3.1'
+          - '3.2'
+        gemfile:
+          - gemfiles/rails_6.0.gemfile
+          - gemfiles/rails_6.1.gemfile
+          - gemfiles/rails_7.0.gemfile
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RAILS_ENV: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec

data/.github/workflows/gempush.yml

@@ -1,9 +1,8 @@
-name: Ruby Gem
+name: Release Gem
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [released]
 
 jobs:
   build:
@@ -12,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby 3.2
+        uses: ruby/setup-ruby@v1
         with:
-          version: 2.6.x
+          ruby-version: '3.2'
 
       - name: Publish to RubyGems
         run: |

data/.gitignore

@@ -7,5 +7,7 @@ spec/db/other_test.db
 spec/db/data_schema.rb
 .vscode/
 .DS_Store
+.ruby-gemset
+.ruby-version
 .idea/
-vendor/
+vendor/

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.3'
-end
-
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
 end

data/Changelog.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 9.1.0
+
+- Fix a bug that caused `schema_sha1` in `ar_internal_metadata` to be reset to the `data_schema.rb` file. (#272)
+- Remove the need for empty data_schema files for non-primary databases. (#273)
+
+## [YANKED] 10.0.3.rc
+
+- Remove all travis references [leoarnold](https//:github.com/leoarnold)
+- Changing to rc because of ongoing discussion how to properly handle multiple database environments
+
+## [YANKED] 10.0.2
+
+Change "rails" dependencies to "railties"
+
+## [YANKED] 10.0.1
+
+- Bug fix for Rails 6 config [chaunce](https//:github.com/chaunce)
+- Railties bug fix by [opti](https://github.com/opti)
+
+## [YANKED] 10.0.0
+
+Releasing 10.0.0
+
+!!! Breaking changes !!!
+
+- This version introduces a breaking change which may lead to undesired
+behavior in multi-database environments. See https://github.com/ilyakatz/data-migrate/issues/181
+
+## [YANKED] 10.0.0.rc1
+
+- Changes by [chaunce](https//:github.com/chaunce)
+- Multiple databases support
+- Refactor to clean things up
+- Deprecate rails 5.2 support for real
+
+## 9.0.0
+
+Ruby 3.2 support [mehanoid](https://github.com/mehanoid)
+Rails 5.2 is no longer supported
+
 ## 8.5.0
 
 Allow custom templates [bazay](https://github.com/bazay)

data/README.md

@@ -2,7 +2,7 @@
 
 - [![Version](http://img.shields.io/gem/v/data_migrate.svg?style=flat-square)](https://rubygems.org/gems/data_migrate)
 - [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
-- [![Travis](https://img.shields.io/travis/ilyakatz/data-migrate.svg)](https://travis-ci.org/ilyakatz/data-migrate)
+- ![.github/workflows/build.yml](https://github.com/ilyakatz/data-migrate/actions/workflows/.github/workflows/build.yml/badge.svg)
 - [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 Run data migrations alongside schema migrations.
@@ -12,7 +12,7 @@ migrations, except they should be reserved for data migrations. For
 instance, if you realize you need to titleize all your titles, this
 is the place to do it.
 
-![Travis](./screenshot.png)
+![directory tree example](./screenshot.png)
 
 ## Why should I use this?
 
@@ -36,7 +36,7 @@ table to track all migrations.
 
 ## Rails Support
 
-Support Rails 5.2 through 7.0
+Support Rails 6.0 through 7.0
 
 
 #### v1
@@ -92,11 +92,13 @@ You can generate a data migration as you would a schema migration:
     rake db:version:with_data                      # Retrieves the current schema version numbers for data and schema migrations
 
 
-Tasks work as they would with the 'vanilla' db version. The 'with_data' addition to the 'db' tasks will run the task in the context of both the data and schema migrations. That is, rake db:rollback:with_data will check to see if it was a schema or data migration invoked last, and do that. Tasks invoked in that space also have an additional line of output, indicating if the action is performed on data or schema.
+Tasks work as they would with the 'vanilla' db version. The 'with_data' addition to the 'db' tasks will run the task in the context of both the data and schema migrations. That is, rake db:rollback:with_data will check to see if it was a schema or data migration invoked last, and do that. Tasks invoked in that space also have an additional line of output, indicating if the action is performed on data or schema. 
 
 With 'up' and 'down', you can specify the option 'BOTH', which defaults to false. Using true, will migrate both the data and schema (in the desired direction) if they both match the version provided. Again, going up, schema is given precedence. Down its data.
 
-`rake db:migrate:status:with_data` provides and additional column to indicate which type of migration.
+When using `rake db:migrate:with_data` migrations will be run in ascending order by their version. For example, if you have a data migration with version 20230410000000 and a schema migration with version 20230415000000, expect the data migration to run first.
+
+`rake db:migrate:status:with_data` provides an additional column to indicate which type of migration.
 
 ### Configuration
 
@@ -162,9 +164,9 @@ Run tests for a specific version of Rails
 
 ```
 bundle exec appraisal install
-bundle exec appraisal rails-5.1 rspec
-bundle exec appraisal rails-5.2 rspec
 bundle exec appraisal rails-6.0 rspec
+bundle exec appraisal rails-6.1 rspec
+bundle exec appraisal rails-7.0 rspec
 ```
 
 ## Thanks

data/data_migrate.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     activerecord
     railties
   ].each do |rails_gem|
-    s.add_dependency(rails_gem, '>= 5.0')
+    s.add_dependency(rails_gem, '>= 6.0')
   end
 
   s.add_development_dependency "appraisal"
@@ -38,13 +38,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.post_install_message = <<-POST_INSTALL_MESSAGE
-#{"*" * 80}
-data-migrate: IMPORTANT: Breaking change introduced for migrations from v2.
-
-Failure to run the migration can have serious consequences.
-See Readme for more info.
-#{"*" * 80}
-POST_INSTALL_MESSAGE
 end

data/lib/data_migrate/config.rb

@@ -25,7 +25,7 @@ module DataMigrate
 
     def data_template_path=(value)
       @data_template_path = value.tap do |path|
-        raise ArgumentError, "File not found: '#{path}'" unless path == DEFAULT_DATA_TEMPLATE_PATH || File.exists?(path)
+        raise ArgumentError, "File not found: '#{path}'" unless path == DEFAULT_DATA_TEMPLATE_PATH || File.exist?(path)
       end
     end
   end

data/lib/data_migrate/{data_migrator_five.rb → data_migrator.rb}

@@ -9,8 +9,7 @@ module DataMigrate
       [DataMigrate.config.data_migrations_path]
     end
 
-    def self.assure_data_schema_table
-      ActiveRecord::Base.establish_connection(db_config)
+    def self.create_data_schema_table
       DataMigrate::DataSchemaMigration.create_table
     end
 
@@ -73,16 +72,6 @@ module DataMigrate
       def rollback(migrations_path, steps)
         DataMigrate::MigrationContext.new(migrations_path).rollback(steps)
       end
-
-      def db_config
-        env = Rails.env || "development"
-        ar_config = if (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1) || Rails::VERSION::MAJOR > 6
-                      ActiveRecord::Base.configurations.configs_for(env_name: env).first
-                    else
-                      ActiveRecord::Base.configurations[env]
-                    end
-        ar_config || ENV["DATABASE_URL"]
-      end
     end
 
     private

data/lib/data_migrate/data_schema.rb

@@ -9,7 +9,7 @@ module DataMigrate
     #   ActiveRecord::ConnectionAdapters::SchemaStatements
     #     #assume_migrated_upto_version
     def define(info)
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
 
       return if info[:version].blank?
 

data/lib/data_migrate/database_tasks.rb

@@ -9,36 +9,23 @@ module DataMigrate
     extend ActiveRecord::Tasks::DatabaseTasks
 
     class << self
-      def schema_file_type(_format = nil)
-        "data_schema.rb"
+      def schema_file(_format = nil)
+        File.join(db_dir, "data_schema.rb")
       end
 
-      def dump_filename(namespace, format = ActiveRecord::Base.schema_format)
-        filename = if namespace == "primary"
-          schema_file_type(format)
-        else
-          "#{namespace}_#{schema_file_type(format)}"
-        end
-
-        ENV["DATA_SCHEMA"] || File.join(schema_location, filename)
+      def schema_file_type(_format = nil)
+        "data_schema.rb"
       end
 
-      def schema_dump_path(db_config, format = ActiveRecord.schema_format)
-        return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"]
-
-        filename = if db_config.primary?
+      # This method is removed in Rails 7.0
+      def dump_filename(spec_name, format = ActiveRecord::Base.schema_format)
+        filename = if spec_name == "primary"
           schema_file_type(format)
         else
-          [db_config.name, schema_file_type(format)].join("_")
+          "#{spec_name}_#{schema_file_type(format)}"
         end
 
-        return unless filename
-
-        File.dirname(filename) == schema_location ? filename : File.join(schema_location, filename)
-      end
-
-      def schema_location
-        db_dir
+        ENV["DATA_SCHEMA"] || File.join(db_dir, filename)
       end
 
       def check_schema_file(filename)
@@ -55,9 +42,8 @@ module DataMigrate
         )
       end
 
-      def sort_migrations set_1, set_2=nil
-        migrations = set_1 + (set_2 || [])
-        migrations.sort{|a,b|  sort_string(a) <=> sort_string(b)}
+      def sort_migrations(*migrations)
+        migrations.flatten.sort { |a, b|  sort_string(a) <=> sort_string(b) }
       end
 
       def sort_string migration
@@ -81,15 +67,26 @@ module DataMigrate
           )
         end
       end
-    end
 
-    # This overrides ActiveRecord::Tasks::DatabaseTasks
-    def self.schema_file(_format = nil)
-      File.join(db_dir, "data_schema.rb")
+      def schema_dump_path(db_config, format = ActiveRecord.schema_format)
+        return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"]
+
+        # We only require a schema.rb file for the primary database
+        return unless db_config.primary?
+
+        File.join(File.dirname(ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(db_config, format)), schema_file_type)
+      end
+
+      # Override this method from `ActiveRecord::Tasks::DatabaseTasks`
+      # to ensure that the sha saved in ar_internal_metadata table
+      # is from the original schema.rb file
+      def schema_sha1(file)
+        ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: "primary"))
+      end
     end
 
     def self.forward(step = 1)
-      DataMigrate::DataMigrator.assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       migrations = pending_migrations.reverse.pop(step).reverse
       migrations.each do | pending_migration |
         if pending_migration[:kind] == :data
@@ -97,23 +94,11 @@ module DataMigrate
           DataMigrate::DataMigrator.run(:up, data_migrations_path, pending_migration[:version])
         elsif pending_migration[:kind] == :schema
           ActiveRecord::Migration.write("== %s %s" % ["Schema", "=" * 69])
-          DataMigrate::SchemaMigration.run(:up, schema_migrations_path, pending_migration[:version])
+          DataMigrate::SchemaMigration.run(:up, DataMigrate::SchemaMigration.migrations_paths, pending_migration[:version])
         end
       end
     end
 
-    def self.data_migrations_path
-      DataMigrate.config.data_migrations_path
-    end
-
-    def self.schema_migrations_path
-      "db/migrate/"
-    end
-
-    def self.pending_migrations
-      sort_migrations(pending_schema_migrations, pending_data_migrations)
-    end
-
     def self.pending_data_migrations
       data_migrations = DataMigrate::DataMigrator.migrations(data_migrations_path)
       sort_migrations(DataMigrate::DataMigrator.new(:up, data_migrations ).
@@ -124,36 +109,12 @@ module DataMigrate
       ::DataMigrate::SchemaMigration.pending_schema_migrations
     end
 
-    def self.sort_migrations(set1, set2 = nil)
-      migrations = set1 + (set2 || [])
-      migrations.sort {|a, b|  sort_string(a) <=> sort_string(b)}
-    end
-
-    def self.sort_string(migration)
-      "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
-    end
-
     def self.past_migrations(sort = nil)
-      sort = sort.downcase if sort
-      db_list_data =
-        if DataMigrate::DataSchemaMigration.table_exists?
-          DataMigrate::DataSchemaMigration.normalized_versions.sort
-        else
-          []
-        end
-      db_list_schema = ActiveRecord::SchemaMigration.normalized_versions.sort.sort
-      migrations = db_list_data.map do |d|
-        {
-          version: d.to_i, kind: :data
-        }
-      end +
-                   db_list_schema.map do |d|
-                     {
-                       version: d.to_i, kind: :schema
-                     }
-                   end
-
-      sort == "asc" ? sort_migrations(migrations) : sort_migrations(migrations).reverse
+      data_versions = DataMigrate::DataSchemaMigration.table_exists? ? DataMigrate::DataSchemaMigration.normalized_versions : []
+      schema_versions = ActiveRecord::SchemaMigration.normalized_versions
+      migrations = data_versions.map { |v| { version: v.to_i, kind: :data } } + schema_versions.map { |v| { version: v.to_i, kind: :schema } }
+
+      sort&.downcase == "asc" ? sort_migrations(migrations) : sort_migrations(migrations).reverse
     end
   end
 end

data/lib/data_migrate/{schema_migration_six.rb → schema_migration.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DataMigrate
   # Helper class to getting access to db schema
   # to allow data/schema combiation tasks
@@ -22,9 +24,9 @@ module DataMigrate
 
     def self.migrations_paths
       spec_name = DataMigrate.config.spec_name
-      if spec_name && Rails.version > '6.1'
+      if spec_name && Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
         ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: spec_name).migrations_paths
-      elsif spec_name
+      elsif spec_name && Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
         ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name).migrations_paths
       else
         Rails.application.config.paths["db/migrate"].to_a

data/lib/data_migrate/{status_service_five.rb → status_service.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DataMigrate
   class StatusService
     class << self
@@ -32,12 +34,8 @@ module DataMigrate
       end
 
       # output
-      if ActiveRecord.version >= Gem::Version.new('7.0')
-        stream.puts "\ndatabase: #{ActiveRecord::Base.connection_db_config.configuration_hash[:database]}\n\n"
-      else
-        stream.puts "\ndatabase: #{ActiveRecord::Base.connection_config[:database]}\n\n"
-      end
-      stream.puts "#{'Status'.center(8)}  #{'Migration ID'.ljust(14)}  Migration Name"
+      stream.puts "\ndatabase: #{database_name}\n\n"
+      stream.puts "#{"Status".center(8)}  #{"Migration ID".ljust(14)}  Migration Name"
       stream.puts "-" * 50
       db_list.each do |status, version, name|
         stream.puts "#{status.center(8)}  #{version.ljust(14)}  #{name}"
@@ -45,6 +43,14 @@ module DataMigrate
       stream.puts
     end
 
+    def database_name
+      if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
+        ActiveRecord::Base.connection_db_config.configuration_hash[:database]
+      elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
+        ActiveRecord::Base.connection_config[:database]
+      end
+    end
+
     def db_list
       DataMigrate::DataMigrator.migrations_status
     end

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 module DataMigrate
   module Tasks
     module DataMigrateTasks
       extend self
 
-      def schema_migrations_path
-        File.join('db', 'migrate')
-      end
-
       def migrations_paths
         @migrations_paths ||= DataMigrate.config.data_migrations_path
       end
@@ -24,13 +22,13 @@ module DataMigrate
       def migrate
         target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
 
-        DataMigrate::DataMigrator.assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         DataMigrate::MigrationContext.new(migrations_paths).migrate(target_version)
       end
 
       def abort_if_pending_migrations(migrations, message)
         if migrations.any?
-          puts "You have #{migrations.size} pending #{migrations.size > 1 ? 'migrations:' : 'migration:'}"
+          puts "You have #{migrations.size} pending #{'migration'.pluralize(migrations.size)}:"
           migrations.each do |pending_migration|
             puts "  %4d %s" % [pending_migration[:version], pending_migration[:name]]
           end
@@ -47,24 +45,14 @@ module DataMigrate
       end
 
       def status
-        config = connect_to_database
-        return unless config
-
-        connection = ActiveRecord::Base.connection
-        puts "\ndatabase: #{config['database']}\n\n"
-        DataMigrate::StatusService.dump(connection)
+        DataMigrate::StatusService.dump
       end
 
       def status_with_schema
-        config = connect_to_database
-        return unless config
-
         db_list_data = ActiveRecord::Base.connection.select_values(
           "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}"
         )
-        db_list_schema = ActiveRecord::Base.connection.select_values(
-          "SELECT version FROM #{ActiveRecord::SchemaMigration.schema_migrations_table_name}"
-        )
+        db_list_schema = ActiveRecord::SchemaMigration.all.pluck(:version)
         file_list = []
 
         Dir.foreach(File.join(Rails.root, migrations_paths)) do |file|
@@ -75,7 +63,9 @@ module DataMigrate
           end
         end
 
-        Dir.foreach(File.join(Rails.root, schema_migrations_path)) do |file|
+        DataMigrate::SchemaMigration.migrations_paths.map do |path|
+          Dir.children(path) if Dir.exist?(path)
+        end.flatten.compact.each do |file|
           # only files matching "20091231235959_some_name.rb" pattern
           if match_data = /(\d{14})_(.+)\.rb/.match(file)
             status = db_list_schema.delete(match_data[1]) ? 'up' : 'down'
@@ -86,7 +76,7 @@ module DataMigrate
         file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" }
 
         # output
-        puts "\ndatabase: #{config['database']}\n\n"
+        puts "\ndatabase: #{database_name}\n\n"
         puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
         puts "-" * 60
         file_list.each do |file|
@@ -103,23 +93,12 @@ module DataMigrate
 
       private
 
-      def connect_to_database
-        config = if ActiveRecord.version < Gem::Version.new('6.1')
-          ActiveRecord::Base.configurations[Rails.env || 'development']
-        else
-          ActiveRecord::Base.configurations.find_db_config(Rails.env || 'development').configuration_hash
-        end
-        ActiveRecord::Base.establish_connection(config)
-
-        unless DataMigrate::DataSchemaMigration.table_exists?
-          puts 'Data migrations table does not exist yet.'
-          config = nil
-        end
-        unless ActiveRecord::SchemaMigration.table_exists?
-          puts 'Schema migrations table does not exist yet.'
-          config = nil
+      def database_name
+        if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
+          ActiveRecord::Base.connection_db_config.database
+        elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
+          ActiveRecord::Base.connection_config[:database]
         end
-        config
       end
     end
   end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "8.5.0".freeze
+  VERSION = "9.1.1".freeze
 end

data/lib/data_migrate.rb

@@ -1,22 +1,17 @@
 # frozen_string_literal: true
 
-require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator")
 require File.join(File.dirname(__FILE__), "data_migrate", "data_schema_migration")
 require File.join(File.dirname(__FILE__), "data_migrate", "data_schema")
 require File.join(File.dirname(__FILE__), "data_migrate", "database_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "schema_dumper")
-require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "status_service")
 require File.join(File.dirname(__FILE__), "data_migrate", "migration_context")
 require File.join(File.dirname(__FILE__), "data_migrate", "railtie")
 require File.join(File.dirname(__FILE__), "data_migrate", "tasks/data_migrate_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "legacy_migrator")
 require File.join(File.dirname(__FILE__), "data_migrate", "config")
-
-if Rails::VERSION::MAJOR == 5
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")
-else
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_six")
-end
+require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration")
 
 module DataMigrate
   def self.root