data_migrate 10.0.0.rc1 → 10.0.3.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d212f0e6fa0c9b767cbdf17854c7c52d640a9c8611d0b10ed6c0460de68985cd
-  data.tar.gz: ac338ef447f1942d64eb5cf6c0fe520f71089968c04fb03fb829a1318534b4eb
+  metadata.gz: 2bb05d428228b17b10beb94404770d5290cbb9727b7185356f3833dc440a40e6
+  data.tar.gz: e1a996f14dce42f3743db8bc74a128893b97a41cc97c63db1202db1733b1349e
 SHA512:
-  metadata.gz: 01ae940433e4cd51a2f421297fb3ffb72372503971ee906164129c035c89aedb6c18d5003cd083930c24245f16728c38c93aed94fb8d9b2f7d0288895362a3d4
-  data.tar.gz: 9d94ff40ed274256247960c0dd1325645b638ac2198d29b3bce2c3c11f842b4b0a2b381bd73fcb17af308ab366cdca16c7f99c9e2fa778da7ab6103352e50ba1
+  metadata.gz: 005deffc4ecd6a9f02ca76c84f2fbd8ad70f4e294e6d4259d92f2e2ce1f54f1a5032767ec2a0759af762571ff99fe1f7e290d9d3ec414ba69ebc2b7b673a2c65
+  data.tar.gz: a4db456966db55f1b3428a239a76dd00ba352417a796957474b20cd163918fe48f79096cad7d513d9d1bd180465bbde2969c39a182c38c08afde64705d23880d

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/Changelog.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 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
+
+## 10.0.2
+
+Change "rails" dependencies to "railties"
+
+## 10.0.1
+
+- Bug fix for Rails 6 config [chaunce](https//:github.com/chaunce)
+- Railties bug fix by [opti](https://github.com/opti)
+
+## 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
+
 ## 10.0.0.rc1
 
 - Changes by [chaunce](https//:github.com/chaunce)

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?
 
@@ -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
 

data/lib/data_migrate/schema_migration.rb

@@ -24,9 +24,9 @@ module DataMigrate
 
     def self.migrations_paths
       spec_name = DataMigrate.config.spec_name
-      if spec_name && Gem::Dependency.new("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+      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 && Gem::Dependency.new("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].version)
+      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.rb

@@ -44,9 +44,9 @@ module DataMigrate
     end
 
     def database_name
-      if Gem::Dependency.new("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+      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("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].version)
+      elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
         ActiveRecord::Base.connection_config[:database]
       end
     end

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -95,9 +95,9 @@ module DataMigrate
       private
 
       def spec_name(db_config)
-        if Gem::Dependency.new("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+        if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
           db_config.name
-        elsif Gem::Dependency.new("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].version)
+        elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
           db_config.spec_name
         end
       end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "10.0.0.rc1".freeze
+  VERSION = "10.0.3.rc".freeze
 end

data/spec/data_migrate/database_tasks_spec.rb

@@ -28,7 +28,7 @@ describe DataMigrate::DatabaseTasks do
       data_migrations_path
     }
     ActiveRecord::Base.establish_connection(db_config)
-    if Gem::Dependency.new("rails", ">= 6.1").match?("rails", Gem.loaded_specs["rails"].version)
+    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)

data/spec/data_migrate/schema_migration_spec.rb

@@ -61,9 +61,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("rails", "~> 6.0").match?("rails", Gem.loaded_specs["rails"].version)
+        if Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
           { env_name: Rails.env, spec_name: specification_name }
-        elsif Gem::Dependency.new("rails", "~> 7.0").match?("rails", Gem.loaded_specs["rails"].version)
+        elsif Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
           { env_name: Rails.env, name: specification_name }
         end
       end

data/spec/data_migrate/status_service_spec.rb

@@ -7,7 +7,7 @@ describe DataMigrate::StatusService do
   let(:stream) { StringIO.new }
   let(:stream_data) { stream.read }
   let(:connection_db_config) do
-    if Gem::Dependency.new("rails", ">= 6.1").match?("rails", Gem.loaded_specs["rails"].version)
+    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

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 
 describe DataMigrate::Tasks::DataMigrateTasks do
   let(:connection_db_config) do
-    if Gem::Dependency.new("rails", ">= 6.1").match?("rails", Gem.loaded_specs["rails"].version)
+    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

data/tasks/databases.rake

@@ -6,7 +6,12 @@ namespace :db do
   namespace :migrate do
     desc "Migrate the database data and schema (options: VERSION=x, VERBOSE=false)."
     task :with_data => :environment do
-      original_db_config = ActiveRecord::Base.connection_db_config
+      original_db_config = if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
+        ActiveRecord::Base.connection_db_config
+      elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
+        ActiveRecord::Base.connection_config
+      end
+
       ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
         ActiveRecord::Base.establish_connection(db_config)
         DataMigrate::DataMigrator.assure_data_schema_table
@@ -204,7 +209,12 @@ end
 namespace :data do
   desc 'Migrate data migrations (options: VERSION=x, VERBOSE=false)'
   task :migrate => :environment do
-    original_db_config = ActiveRecord::Base.connection_db_config
+    original_db_config = if Gem::Dependency.new("railties", "~> 7.0").match?("railties", Gem.loaded_specs["railties"].version)
+      ActiveRecord::Base.connection_db_config
+    elsif Gem::Dependency.new("railties", "~> 6.0").match?("railties", Gem.loaded_specs["railties"].version)
+      ActiveRecord::Base.connection_config
+    end
+
     ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
       ActiveRecord::Base.establish_connection(db_config)
       DataMigrate::Tasks::DataMigrateTasks.migrate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 10.0.0.rc1
+  version: 10.0.3.rc
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -198,8 +198,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-style.yml"
-- ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - Changelog.md
 - Gemfile

data/.ruby-version

@@ -1 +0,0 @@
-2.7.5

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.7
-  - 3.0
-  - 3.2
-script: bundle exec rspec
-gemfile:
-  - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_6.1.gemfile
-  - gemfiles/rails_7.0.gemfile
-jobs:
-  exclude:
-    - rvm: 3.0
-    - rvm: 3.2