data_migrate 6.0.7 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07f90de015dd791891bb123bb7ab577cf63e7eab3d3c4ffac79fc1bde1ec688
-  data.tar.gz: 8b161c0ff1c89696bde0bcd94d5ff9e5a9b4be94148c29e99d034f783161c884
+  metadata.gz: 18145281c69f3a789a8fc2de0873b3ddbed3c1ccec3faed5de71a9ed2dad6e58
+  data.tar.gz: 93e91ecc167ad2fb8cf2ef664adf405e9d47868ead4ce0f24057269c9139dea0
 SHA512:
-  metadata.gz: 1075302951b2cd717758d63bcec5e1ee5a70d2871ed81d3b6a3312b6978fb42087eb896b104afeff9add287f3d932fb2856a31b407e352fc4349d454ebdb7605
-  data.tar.gz: f2cec3fb11588a0b1ab70c2958c36a75a5f37837189aa26b20d6eaacf3a9fca84f3bf18ff8bd0eda6c411b91a1d2050e7a76fb794ff9dc40dcbb71007f2202ca
+  metadata.gz: 3ff5ee90e37051fb6668ae63a2640c41cc8be3e301a6c5bb7b58a5581f81de71b54ecab7f66b0136c88733d9f4314b2e85e5c739da4ba9939607d7e0cde8c8b6
+  data.tar.gz: a328b2ddc325d69d98197ae2ae5db29932377e1c0bf1947ab08297bc5973ed167fbbc42ed70d35993fb02250efab721cdb0a4fb6789339da6f02af10a1664093

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 2.6.2
 script: bundle exec rspec
 gemfile:
-  - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile

data/Appraisals

@@ -11,5 +11,5 @@ appraise 'rails-5.2' do
 end
 
 appraise 'rails-6.0' do
-  gem 'rails', '~> 6.0.0.beta3'
+  gem 'rails', '~> 6.0.0'
 end

data/Changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 6.1.0
+
+Fixing `rake db:schema:load:with_data` for Rails 6
+
+Note:
+
+Rails 5.0 is no longer maintained. The gem will still work but it is not being
+actively tested.
+
 ## 6.0.5
 
 Fixing `needs_migration?` method for Rails 5.2 and up [EnomaDebby](https://github.com/EnomaDebby)

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
-gem 'rails', path: "~/ws/rails"
+gem 'rails', '~> 6.0.0'
 gem 'sqlite3', "~> 1.4"
 gemspec

data/README.md

@@ -14,45 +14,12 @@ is the place to do it.
 
 ![Travis](./screenshot.png)
 
-# Why should I use this?
-
-Its seems when a project hits a certain size, I get to manipulate data
-outside the application itself. Changing defaults, new validations,
-one-to-one to one-to-many... I found it a pain and dodgy to have to
-step up migrations one by one, run a ruby script of some sort, then
-resume migrations. It tanks a lot of the automation of deploy.
-
-If you don't use the one off scripts, you could do it as a regular
-migration. It'd be much better to keep concerns separate. The benefit
-of having them separate has to do with your data model.
-
-For instance, lets take an absurd example, to illustrate: You have
-a blog application that has posts with many comments.
-After some use, you decide you are going to be a trend setter,
-and want only one comment per post, and just the text.
-
-Given that you:
-
-- write a migration to add a comment column to `Post`
-- write a migration to move the contents of the first comments to the `Post`
-- drop the `column_id` column from `Post`
-- drop the `Comment` model
-- fix all your tests
-
-You've just got bit. When you `rake setup:development`, the mess gets
-mad at you after it creates your database, and starts cranking through
-migrations. It gets to the part where you iterate over the comments
-and it blows up. You don't have a `Comment` model anymore for it to
-even try and get 'all' from. You think you are smarter, and wrap the
-ActiveRecord call in a conditional based on the environment.
-
-That's fine until you get that QA gal, and she wants her own thing.
-Then the UI people get tired of waiting for the full stack to load on page
-refreshes, so you have to edit past migrations...
-
-With Data Migrate, you have the control. You can generate your
-migrations as schema or data as you would as your work flow. For
-setting tasks that don't require any intermediate AR activity, like
+## Why should I use this?
+
+With data-migrate you can generate your migrations for data as you would schema
+in your regular work flow.
+
+For setting tasks that don't require any intermediate AR activity, like
 dev and test, you stick with `db:migrate`. For production and QA, you
 change their scripts to `db:migrate:with_data`. Of course you want to
 test your migration, so you have the choice of `db:migrate:with_data` or
@@ -65,7 +32,7 @@ migrations, except they should be reserved for data migrations. For
 instance, if you realize you need to titleize all yours titles, this
 is the place to do it. Running any of the provided rake tasks also
 creates a data schema table to mirror the usual schema migrations
-table to track all the goodness.
+table to track all migrations.
 
 ## Rails Support
 
@@ -175,14 +142,15 @@ Run tests for a specific version of Rails
 
 ```
 bundle exec appraisal install
-bundle exec appraisal rails-5.0 rspec
+bundle exec appraisal rails-5.1 rspec
 bundle exec appraisal rails-5.2 rspec
+bundle exec appraisal rails-6.0 rspec
 ```
 
 ## Thanks
 
 [Andrew J Vargo](http://github.com/ajvargo) Andrew was the original creator and maintainer of this project!
 
-[Jeremy Durham](http://jeremydurham.com/) for fleshing out the idea with me, and providing guidance.
+[Jeremy Durham](http://jeremydurham.com/) for fleshing out the idea and providing guidance.
 
 You! Yes, you. Thanks for checking it out.

data/gemfiles/rails_5.1.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "5.1.7"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.2.3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 6.0.0.rc2"
+gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/data_migrate/database_tasks.rb

@@ -8,6 +8,33 @@ module DataMigrate
   class DatabaseTasks
     extend ActiveRecord::Tasks::DatabaseTasks
 
+    class << self
+      def schema_file_type(_format = nil)
+        "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)
+      end
+
+      def schema_location
+        db_dir
+      end
+
+      def check_schema_file(filename)
+        unless File.exist?(filename)
+          message = +%{#{filename} doesn't exist yet. Run `rake data:migrate` to create it, then try again.}
+          Kernel.abort message
+        end
+      end
+    end
+
     # This overrides ActiveRecord::Tasks::DatabaseTasks
     def self.schema_file(_format = nil)
       File.join(db_dir, "data_schema.rb")

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "6.0.7".freeze
+  VERSION = "6.1.0".freeze
 end

data/spec/data_migrate/data_migrator_spec.rb

@@ -51,9 +51,7 @@ describe DataMigrate::DataMigrator do
     end
 
     it do
-      expect(
-        ActiveRecord::Base.connection.table_exists?("data_migrations")
-      ).to eq false
+      ActiveRecord::Migration.drop_table("data_migrations") rescue nil
       subject.assure_data_schema_table
       expect(
         ActiveRecord::Base.connection.table_exists?("data_migrations")

data/spec/data_migrate/database_tasks_spec.rb

@@ -39,6 +39,7 @@ describe DataMigrate::DatabaseTasks do
       data_migrations_path
     }
     allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
+    ActiveRecord::Base.configurations[:test] =db_config
     ActiveRecord::Base.establish_connection(db_config)
   end
 
@@ -58,7 +59,7 @@ describe DataMigrate::DatabaseTasks do
     end
 
     before do
-      ActiveRecord::Base.establish_connection(db_config)
+      # ActiveRecord::Base.establish_connection(db_config)
       ActiveRecord::SchemaMigration.create_table
 
       allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) {
@@ -86,6 +87,35 @@ describe DataMigrate::DatabaseTasks do
       end
     end
 
+    describe :load_schema_current do
+      before do
+        allow(DataMigrate::DataMigrator).to receive(:full_migrations_path).and_return(migration_path)
+      end
+
+      it "loads the current schema file" do
+        if Rails::VERSION::MAJOR < 6
+          skip("Not implemented for Rails lower than 6")
+        end
+        allow(subject).to receive(:schema_location).and_return("spec/db/data/schema/")
+
+        subject.load_schema_current
+        versions = DataMigrate::DataSchemaMigration.normalized_versions
+        expect(versions.count).to eq(2)
+      end
+
+      it "loads schema file that has not been update with latest data migrations" do
+        if Rails::VERSION::MAJOR < 6
+          skip("Not implemented for Rails lower than 6")
+        end
+
+        allow(subject).to receive(:schema_location).and_return("spec/db/data/partial_schema/")
+
+        subject.load_schema_current
+        versions = DataMigrate::DataSchemaMigration.normalized_versions
+        expect(versions.count).to eq(1)
+      end
+    end
+
     describe :forward do
 
       it "run forward default amount of times" do

data/spec/db/data/partial_schema/data_schema.rb

@@ -0,0 +1,2 @@
+# encoding: UTF-8
+DataMigrate::Data.define(version: 20091231235959)

data/spec/db/data/schema/data_schema.rb

@@ -0,0 +1,2 @@
+# encoding: UTF-8
+DataMigrate::Data.define(version: 20171231235959)

data/spec/spec_helper.rb

@@ -10,9 +10,16 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.after(:each) do
+    DataMigrate.configure do |config|
+      config.data_migrations_path = @prev_data_migrations_path
+    end
+  end
+
   config.before(:each) do |example|
     if example.metadata[:no_override]
     else
+      @prev_data_migrations_path = DataMigrate.config.data_migrations_path
       if Rails::VERSION::MAJOR == 6
         DataMigrate.configure do |config|
           config.data_migrations_path = "spec/db/6.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.1.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -197,7 +197,6 @@ files:
 - data_migrate.gemspec
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
@@ -250,6 +249,8 @@ files:
 - spec/db/data/20091231235959_some_name.rb
 - spec/db/data/20171231235959_super_update.rb
 - spec/db/data/20181128000207_excluded_file.rb.other_ext
+- spec/db/data/partial_schema/data_schema.rb
+- spec/db/data/schema/data_schema.rb
 - spec/db/migrate/4.2/20131111111111_late_migration.rb
 - spec/db/migrate/4.2/20202020202011_db_migration.rb
 - spec/db/migrate/5.0/20131111111111_late_migration.rb

data/gemfiles/rails_5.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "5.0.7.2"
-
-gemspec path: "../"