data_migrate 9.0.0 → 10.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2acff14ddfe78e35e593865b31aaa8f5964c7bc958b7f40f7019333288efaa4e
-  data.tar.gz: 3098c184b2bb1ba2f2ed75181c31938800c0c0313431b6b1749ff4b103ee0f33
+  metadata.gz: d212f0e6fa0c9b767cbdf17854c7c52d640a9c8611d0b10ed6c0460de68985cd
+  data.tar.gz: ac338ef447f1942d64eb5cf6c0fe520f71089968c04fb03fb829a1318534b4eb
 SHA512:
-  metadata.gz: ba3d909404e128ddb3f7319c83301a7f7395e13226e47c2c35f858535e32d15dd25bb89b475841edf013643407b29a56ebe0eb89f86d1f2f14c66178d868894f
-  data.tar.gz: 7039baeee12e08f77f7cfa680b1841a9137291aa8c3e7c299fe779d8343182a7f851e582b9614d8674add0df9727d38d2918ae726f17a888cd07d4bb556d0360
+  metadata.gz: 01ae940433e4cd51a2f421297fb3ffb72372503971ee906164129c035c89aedb6c18d5003cd083930c24245f16728c38c93aed94fb8d9b2f7d0288895362a3d4
+  data.tar.gz: 9d94ff40ed274256247960c0dd1325645b638ac2198d29b3bce2c3c11f842b4b0a2b381bd73fcb17af308ab366cdca16c7f99c9e2fa778da7ab6103352e50ba1

data/.github/workflows/gempush.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - chaunce-multiple_connection_support
 
 jobs:
   build:

data/.travis.yml

@@ -5,13 +5,10 @@ rvm:
   - 3.2
 script: bundle exec rspec
 gemfile:
-  - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
   - gemfiles/rails_6.1.gemfile
   - gemfiles/rails_7.0.gemfile
 jobs:
   exclude:
     - rvm: 3.0
-      gemfile: gemfiles/rails_5.2.gemfile
     - rvm: 3.2
-      gemfile: gemfiles/rails_5.2.gemfile

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,13 @@
 # Changelog
 
+## 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)

data/README.md

@@ -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
@@ -162,9 +162,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/lib/data_migrate/{data_migrator_five.rb → data_migrator.rb}

@@ -10,7 +10,6 @@ module DataMigrate
     end
 
     def self.assure_data_schema_table
-      ActiveRecord::Base.establish_connection(db_config)
       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/database_tasks.rb

@@ -13,32 +13,14 @@ module DataMigrate
         "data_schema.rb"
       end
 
-      def dump_filename(namespace, format = ActiveRecord::Base.schema_format)
-        filename = if namespace == "primary"
+      def dump_filename(spec_name, format = ActiveRecord::Base.schema_format)
+        filename = if spec_name == "primary"
           schema_file_type(format)
         else
-          "#{namespace}_#{schema_file_type(format)}"
+          "#{spec_name}_#{schema_file_type(format)}"
         end
 
-        ENV["DATA_SCHEMA"] || File.join(schema_location, filename)
-      end
-
-      def schema_dump_path(db_config, format = ActiveRecord.schema_format)
-        return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"]
-
-        filename = if db_config.primary?
-          schema_file_type(format)
-        else
-          [db_config.name, schema_file_type(format)].join("_")
-        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 +37,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
@@ -83,11 +64,6 @@ module DataMigrate
       end
     end
 
-    # This overrides ActiveRecord::Tasks::DatabaseTasks
-    def self.schema_file(_format = nil)
-      File.join(db_dir, "data_schema.rb")
-    end
-
     def self.forward(step = 1)
       DataMigrate::DataMigrator.assure_data_schema_table
       migrations = pending_migrations.reverse.pop(step).reverse
@@ -97,23 +73,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 +88,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("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
         ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: spec_name).migrations_paths
-      elsif spec_name
+      elsif spec_name && Gem::Dependency.new("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].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("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+        ActiveRecord::Base.connection_db_config.configuration_hash[:database]
+      elsif Gem::Dependency.new("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].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,19 +1,17 @@
+# 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
 
-      def dump
+      def dump(db_config)
         if dump_schema_after_migration?
-          filename = DataMigrate::DatabaseTasks.schema_file
+          filename = DataMigrate::DatabaseTasks.dump_filename(spec_name(db_config), ActiveRecord::Base.schema_format)
           ActiveRecord::Base.establish_connection(DataMigrate.config.db_configuration) if DataMigrate.config.db_configuration
           File.open(filename, "w:utf-8") do |file|
             DataMigrate::SchemaDumper.dump(ActiveRecord::Base.connection, file)
@@ -30,7 +28,7 @@ module DataMigrate
 
       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
@@ -46,25 +44,16 @@ module DataMigrate
         end
       end
 
-      def status
-        config = connect_to_database
-        return unless config
-
-        connection = ActiveRecord::Base.connection
-        puts "\ndatabase: #{config['database']}\n\n"
-        DataMigrate::StatusService.dump(connection)
+      def status(db_config)
+        puts "\ndatabase: #{spec_name(db_config)}\n\n"
+        DataMigrate::StatusService.dump(ActiveRecord::Base.connection)
       end
 
-      def status_with_schema
-        config = connect_to_database
-        return unless config
-
+      def status_with_schema(db_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 +64,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 +77,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: #{spec_name(db_config)}\n\n"
         puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
         puts "-" * 60
         file_list.each do |file|
@@ -103,23 +94,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 spec_name(db_config)
+        if Gem::Dependency.new("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+          db_config.name
+        elsif Gem::Dependency.new("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].version)
+          db_config.spec_name
         end
-        config
       end
     end
   end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "9.0.0".freeze
+  VERSION = "10.0.0.rc1".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

data/spec/data_migrate/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::Config do
@@ -11,41 +13,42 @@ describe DataMigrate::Config do
 
   describe "data migration path configured" do
     subject { DataMigrate.config.data_migrations_path }
+    let(:data_migrations_path) { "db/awesome/" }
+
     before do
-      @before = DataMigrate.config.data_migrations_path
+      @original_data_migrations_path = DataMigrate.config.data_migrations_path
+
       DataMigrate.configure do |config|
-        config.data_migrations_path = "db/awesome/"
+        config.data_migrations_path = data_migrations_path
       end
     end
 
     after do
       DataMigrate.configure do |config|
-        config.data_migrations_path = @before
+        config.data_migrations_path = @original_data_migrations_path
       end
     end
 
     it "equals the custom data migration path" do
-      is_expected.to eq "db/awesome/"
+      is_expected.to eq(data_migrations_path)
     end
   end
 
   describe "data template path configured" do
     subject { DataMigrate.config.data_template_path }
+    let(:data_template_path) { File.join(DataMigrate.root, "generators", "data_migration", "templates", "data_migration.rb") }
 
     before do
-      @before = DataMigrate.config.data_template_path
+      @original_data_migrations_path = DataMigrate.config.data_template_path
+
       DataMigrate.configure do |config|
         config.data_template_path = data_template_path
       end
     end
 
-    let(:data_template_path) do
-      File.join(DataMigrate.root, "generators", "data_migration", "templates", "data_migration.rb")
-    end
-
     after do
       DataMigrate.configure do |config|
-        config.data_template_path = @before
+        config.data_template_path = @original_data_migrations_path
       end
     end
 

data/spec/data_migrate/data_migrator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::DataMigrator do
@@ -10,25 +12,18 @@ describe DataMigrate::DataMigrator do
   end
 
   before do
-    allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
     ActiveRecord::Base.establish_connection(db_config)
+    ::ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
   end
 
-  describe :load_migrated do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-      ::ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create_table
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-      ActiveRecord::Migration.drop_table("schema_migrations")
-    end
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
+  end
 
-    it do
-      subject.assure_data_schema_table
+  describe ".load_migrated" do
+    it "loads migrated versions" do
       DataMigrate::DataSchemaMigration.create(version: 20090000000000)
       ::ActiveRecord::SchemaMigration.create(version: 20100000000000)
       DataMigrate::DataSchemaMigration.create(version: 20110000000000)
@@ -41,16 +36,7 @@ describe DataMigrate::DataMigrator do
   end
 
   describe :assure_data_schema_table do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-    end
-
-    it do
+    it "creates the data_migrations table" do
       ActiveRecord::Migration.drop_table("data_migrations") rescue nil
       subject.assure_data_schema_table
       expect(
@@ -60,13 +46,6 @@ describe DataMigrate::DataMigrator do
   end
 
   describe "#migrations_status" do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-      ::ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create_table
-    end
-
     it "returns all migrations statuses" do
       status = subject.migrations_status
       expect(status.length).to eq 2

data/spec/data_migrate/data_spec.rb

@@ -4,12 +4,6 @@ require "spec_helper"
 
 describe DataMigrate::Data do
   let(:subject) { DataMigrate::Data }
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
-  end
   let(:fixture_file_timestamps) do
     %w[20091231235959 20101231235959 20111231235959]
   end
@@ -28,11 +22,6 @@ describe DataMigrate::Data do
   end
 
   describe :define do
-    before do
-      allow(DataMigrate::DataMigrator).
-        to receive(:db_config) { db_config }
-    end
-
     after do
       ActiveRecord::Migration.drop_table("data_migrations")
     end