data_migrate 6.3.0 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa861e31bdaa49b654d9c40b11b8a8871f5f8d5c3241d17e0072c43ecf4c0c2
-  data.tar.gz: 9151be3e992b0271ded30d0bde83a0b57c2236e701762881b75f27a0663ba4a9
+  metadata.gz: 9d433e96cf05b528252be16a5e05c6143bf278ed36557099ace0747bf80b5653
+  data.tar.gz: 17a0001c0f9bb93507f3147d7ed13e947661d012fe67186e7b768d82635cba2d
 SHA512:
-  metadata.gz: 3a4004c4a456a1b323add0ee2f7b3012c164763476f0be5957a202afc7388e22a1bc521272c6c359c0c0c0f14dc08b7528edc2ba19a908ac56a692ac1cc76832
-  data.tar.gz: b8cc321107a19adf0ccae807d755f5743de9c97f8e0fb86db631473d4f169e8bbdd6f5a97cd6a187eb895417051c73379b1ad4cba390dca620835e874e4fa1b3
+  metadata.gz: 230f8dd3c66d6def374b32af7776f86360ee18df38c36ebb126ab2dd06832009ed95d52cd752d43415a0358a588f3e1ca972275ab01be38e0f6fa0f29e947655
+  data.tar.gz: 9f8d5ce9e098ab46d4eec6330630a577b1c5941d35762d5304a2e390a3b4815df50da374f23ad289865cfa2f02e77db02df4a0a9f5d45aed6314851924cd2d0d

data/.gitignore

@@ -3,6 +3,9 @@
 *.lock
 gemfiles/.bundle
 spec/db/test.db
+spec/db/other_test.db
+spec/db/data_schema.rb
 .vscode/
 .DS_Store
 .idea/
+vendor/

data/.travis.yml

@@ -8,7 +8,10 @@ gemfile:
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 matrix:
   exclude:
     - rvm: 2.4.4
       gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/rails_6.1.gemfile

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
 end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end

data/Changelog.md

@@ -1,5 +1,23 @@
 # Changelog
 
+# 6.7.0
+
+Add configuration for which database name is to be used for database migrations [lewhit](https://github.com/lewhit)
+Add tests for Rails 6.1 [lewhit](https://github.com/lewhit)
+Migrations files should end only in .rb [kroehre](https://github.com/kroehre)
+
+## 6.6.2
+## 6.6.1
+
+configs_for deprecation notice [borama](https://github.com/borama)
+## 6.6.0
+
+Allow data dump connection to be configured [lewhit](https://github.com/lewhit)
+
+## 6.4.0
+
+Add primary key to data_migrations table [aandis](https://github.com/aandis)
+
 ## 6.3.0
 
 Add `abort_if_pending_migrations` rake tasks [tomgia](https://github.com/tomgia)

data/Gemfile.rails6.1

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

data/README.md

@@ -121,7 +121,15 @@ You can override this setting in `config/initializers/data_migrate.rb`
 
 ```ruby
 DataMigrate.configure do |config|
-  config.data_migrations_path = "db/awesomepath/"
+  config.data_migrations_path = 'db/awesomepath/'
+  config.db_configuration = {
+    'host' => '127.0.0.1',
+    'database' => 'awesome_database',
+    'adapter' => 'mysql2',
+    'username' => 'root',
+    'password' => nil,
+  }
+  config.spec_name = 'primary'
 end
 
 ```

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/lib/data_migrate/config.rb

@@ -12,10 +12,12 @@ module DataMigrate
   end
 
   class Config
-    attr_accessor :data_migrations_path
+    attr_accessor :data_migrations_path, :db_configuration, :spec_name
 
     def initialize
       @data_migrations_path = "db/data/"
+      @db_configuration = nil
+      @spec_name = nil
     end
   end
 end

data/lib/data_migrate/data_migrator.rb

@@ -76,17 +76,8 @@ module DataMigrate
 
       def create_table(sm_table)
         ActiveRecord::Base.connection.create_table(sm_table, id: false) do |schema_migrations_table|
-          schema_migrations_table.column :version, :string, null: false
+          schema_migrations_table.string :version, primary_key: true
         end
-
-        suffix = ActiveRecord::Base.table_name_suffix
-        prefix = ActiveRecord::Base.table_name_prefix
-        index_name = "#{prefix}unique_data_migrations#{suffix}"
-
-        options = {unique: true, name: index_name}
-        options[:length] = 191 if ActiveRecord::Base.connection_config[:adapter] == "mysql2"
-
-        ActiveRecord::Base.connection.add_index sm_table, :version, options
       end
 
       def table_exists?(connection, table_name)

data/lib/data_migrate/data_migrator_five.rb

@@ -42,7 +42,7 @@ module DataMigrate
       # @param (String) filename
       # @return (MatchData)
       def match(filename)
-        /(\d{14})_(.+)\.rb/.match(filename)
+        /(\d{14})_(.+)\.rb$/.match(filename)
       end
 
       def needs_migration?
@@ -75,8 +75,13 @@ module DataMigrate
       end
 
       def db_config
-        ActiveRecord::Base.configurations[Rails.env || "development"] ||
-          ENV["DATABASE_URL"]
+        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
 

data/lib/data_migrate/data_schema_migration.rb

@@ -6,8 +6,8 @@ module DataMigrate
         ActiveRecord::Base.table_name_prefix + 'data_migrations' + ActiveRecord::Base.table_name_suffix
       end
 
-      def index_name
-        "#{table_name_prefix}unique_data_migrations#{table_name_suffix}"
+      def primary_key
+        "version"
       end
     end
   end

data/lib/data_migrate/migration.rb

@@ -14,8 +14,8 @@ module DataMigrate
         ActiveRecord::Base.table_name_prefix + "data_migrations" + ActiveRecord::Base.table_name_suffix
       end
 
-      def index_name
-        "#{table_name_prefix}unique_data_migrations#{table_name_suffix}"
+      def primary_key
+        "version"
       end
     end
 

data/lib/data_migrate/migration_five.rb

@@ -14,8 +14,8 @@ module DataMigrate
         ActiveRecord::Base.table_name_prefix + 'data_migrations' + ActiveRecord::Base.table_name_suffix
       end
 
-      def index_name
-        "#{table_name_prefix}unique_data_migrations#{table_name_suffix}"
+      def primary_key
+        "version"
       end
     end
 

data/lib/data_migrate/schema_migration_six.rb

@@ -21,7 +21,14 @@ module DataMigrate
     end
 
     def self.migrations_paths
-      Rails.application.config.paths["db/migrate"].to_a
+      spec_name = DataMigrate.config.spec_name
+      if spec_name && Rails.version > '6.1'
+        ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: spec_name).migrations_paths
+      elsif spec_name
+        ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name).migrations_paths
+      else
+        Rails.application.config.paths["db/migrate"].to_a
+      end
     end
 
     def self.sort_string(migration)

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -6,6 +6,16 @@ module DataMigrate
         @migrations_paths ||= DataMigrate.config.data_migrations_path
       end
 
+      def dump
+        if ActiveRecord::Base.dump_schema_after_migration
+          filename = DataMigrate::DatabaseTasks.schema_file
+          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)
+          end
+        end
+      end
+
       def migrate
         DataMigrate::DataMigrator.assure_data_schema_table
         target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "6.3.0".freeze
+  VERSION = "6.7.0".freeze
 end

data/spec/data_migrate/data_migrator_spec.rb

@@ -82,6 +82,12 @@ describe DataMigrate::DataMigrator do
       end
     end
 
+    context "when the file doesn't end in .rb" do
+      it "returns nil" do
+        expect(subject.match("20091231235959_some_name.rb.un~")).to be_nil
+      end
+    end
+
     context "when the file matches" do
       it "returns a valid MatchData object" do
         match_data = subject.match("20091231235959_some_name.rb")

data/spec/data_migrate/data_schema_migration_spec.rb

@@ -9,8 +9,8 @@ describe DataMigrate::DataSchemaMigration do
   end
 
   describe :index_name do
-    it "returns correct index name" do
-      expect(subject.index_name).to eq("unique_data_migrations")
+    it "returns correct primary key name" do
+      expect(subject.primary_key).to eq("version")
     end
   end
 end

data/spec/data_migrate/database_tasks_spec.rb

@@ -39,8 +39,14 @@ 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)
+    if Rails.version >= '6.1'
+      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)
+    else
+      ActiveRecord::Base.configurations[:test] = db_config
+    end
   end
 
   describe :schema_file do
@@ -59,7 +65,6 @@ describe DataMigrate::DatabaseTasks do
     end
 
     before do
-      # ActiveRecord::Base.establish_connection(db_config)
       ActiveRecord::SchemaMigration.create_table
 
       allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) {

data/spec/data_migrate/migration.rb

@@ -14,6 +14,6 @@ describe subject do
   it "uses correct index name" do
     expect(subject).to receive(:table_name_prefix) { "" }
     expect(subject).to receive(:table_name_suffix) { "" }
-    expect(subject.index_name).to eq("unique_data_migrations")
+    expect(subject.primary_key).to eq("version")
   end
 end

data/spec/data_migrate/schema_migration_spec.rb

@@ -68,4 +68,33 @@ describe DataMigrate::SchemaMigration do
       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(:paths) { ['spec/db/migrate/6.0', 'spec/db/components/migrate/6.0'] }
+
+        if Rails.version > '6.1'
+          before do
+            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', name: 'primary')).to receive(:migrations_paths).and_return(paths)
+            DataMigrate.configure do |config|
+              config.spec_name = 'primary'
+            end
+          end
+        else
+          before do
+            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', spec_name: 'primary')).to receive(:migrations_paths).and_return(paths)
+            DataMigrate.configure do |config|
+              config.spec_name = 'primary'
+            end
+          end
+        end
+
+        it 'lists schema migration paths' do
+          expect(subject.migrations_paths.size).to eq(2)
+          expect(subject.migrations_paths).to eq(paths)
+        end
+      end
+    end
+  end
 end

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -3,6 +3,57 @@
 require "spec_helper"
 
 describe DataMigrate::Tasks::DataMigrateTasks do
+  describe :dump do
+    let(:db_config) do
+      {
+        adapter: "sqlite3",
+        database: "spec/db/other_test.db"
+      }
+    end
+
+    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")
+    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
+      let(:override_config) do
+        {
+          'host' => '127.0.0.1',
+          'database' => 'other_test',
+          'adapter' => 'sqlite3',
+          'username' => 'root',
+          'password' => nil,
+        }
+      end
+
+      before do
+        DataMigrate.configure do |config|
+          config.db_configuration = override_config
+        end
+      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
+    end
+  end
+
   describe :migrate do
     let(:db_config) do
       {
@@ -10,12 +61,12 @@ describe DataMigrate::Tasks::DataMigrateTasks do
         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")
     end
@@ -54,9 +105,9 @@ describe DataMigrate::Tasks::DataMigrateTasks do
         }, {
           name: 'B',
           version: 2
-        }] 
+        }]
       end
-      
+
       it "should abort with given message and print names and versions of pending migrations" do
         expect { subject }
           .to raise_error(SystemExit, message)

data/spec/db/data/partial_schema/test_data_schema.rb

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

data/spec/db/data/schema/test_data_schema.rb

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

data/tasks/databases.rake

@@ -343,19 +343,14 @@ namespace :data do
 
   desc "Create a db/data_schema.rb file that stores the current data version"
   task dump: :environment do
-    if ActiveRecord::Base.dump_schema_after_migration
-      filename = DataMigrate::DatabaseTasks.schema_file
-      File.open(filename, "w:utf-8") do |file|
-        DataMigrate::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-      end
-    end
+    DataMigrate::Tasks::DataMigrateTasks.dump
 
     # Allow this task to be called as many times as required. An example
     # is the migrate:redo task, which calls other two internally
     # that depend on this one.
     Rake::Task["data:dump"].reenable
   end
-  
+
   namespace :schema do
     desc "Load data_schema.rb file into the database"
     task load: :environment do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.7.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,15 +191,18 @@ files:
 - Gemfile.rails5
 - Gemfile.rails5.1
 - Gemfile.rails5.2
+- Gemfile.rails6.1
 - LICENSE
 - README.md
 - Rakefile
 - 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
+- gemfiles/rails_6.1.gemfile
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
@@ -250,7 +253,9 @@ files:
 - 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/partial_schema/test_data_schema.rb
 - spec/db/data/schema/data_schema.rb
+- spec/db/data/schema/test_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
@@ -288,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.