data_migrate 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9494a8b6cdea5a4f06a66f520d98e5845abfae2262c9c98c2cea1d493a89de5
-  data.tar.gz: 28819c7dde00d8a96486e39b6555340881f65278e14fb07814805106d61b972c
+  metadata.gz: b5b08f7465fcf3fba0054816fa8b07b07216ba3831114b0a8d477e24caa7ba98
+  data.tar.gz: 556f3785c1b198cc36daac457809b95fe79754276b2ad4f1056ab1f7dfbd748d
 SHA512:
-  metadata.gz: ab4a15ed15d0a54253644470bb800b24cc3465922b929e7e53b67b1ad868594ba40e40a57552438a93af544b308552b635972d00f5b1c4795022f328a0cbd3ee
-  data.tar.gz: 0f8c135679143d45d34d0e49f1b86f0ff82876ffcd7d223160aa51d4f56ea99f6ad2dc18d13b38223355669334b89ae0f50fa2c42e858e04e69212ab75fe5e74
+  metadata.gz: 3df442c3c71eb087476c1c66a0ad1b0d74672b98a6ada2fb9349874f28a3bb3321ba3bc856278f63756d778e9ea7568771788d6e94a255f6f92a0d673f9782a8
+  data.tar.gz: f56faf7e4dd10ef8a1c9e0698190ee5a6cdf2217e1bbdc1a153bc64b3b43e32d3d0065b81fe2e15f9811fe6a5ba3ee40f722d0009da1e00586f7be97349210cc

data/.gitignore

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

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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)

data/README.md

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

data/lib/data_migrate/config.rb

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

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.5.0".freeze
+  VERSION = "6.6.0".freeze
 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/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.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.