From 264d33fd5c879654c2631e16545b52bb764b41cc Mon Sep 17 00:00:00 2001 From: Gustavo Diel Date: Fri, 23 Sep 2022 13:49:40 -0300 Subject: [PATCH 1/2] feat: fix generation when engines define data migrations path --- lib/data_migrate/config.rb | 3 ++- lib/generators/data_migration/data_migration_generator.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/data_migrate/config.rb b/lib/data_migrate/config.rb index 78ec34d2..67533b7b 100644 --- a/lib/data_migrate/config.rb +++ b/lib/data_migrate/config.rb @@ -12,10 +12,11 @@ def config end class Config - attr_accessor :data_migrations_path, :db_configuration, :spec_name + attr_accessor :data_migrations_gen_path, :data_migrations_path, :db_configuration, :spec_name def initialize @data_migrations_path = "db/data/" + @data_migrations_gen_path = "db/data/" @db_configuration = nil @spec_name = nil end diff --git a/lib/generators/data_migration/data_migration_generator.rb b/lib/generators/data_migration/data_migration_generator.rb index f8279545..ab1546af 100644 --- a/lib/generators/data_migration/data_migration_generator.rb +++ b/lib/generators/data_migration/data_migration_generator.rb @@ -35,7 +35,7 @@ def data_migrations_file_path end def data_migrations_path - DataMigrate.config.data_migrations_path + DataMigrate.config.data_migrations_gen_path || DataMigrate.config.data_migrations_path end end end From dd6378cdeb77c1ac5b9e0adb297ba454cf5c67e4 Mon Sep 17 00:00:00 2001 From: Gustavo Diel Date: Fri, 23 Sep 2022 14:25:52 -0300 Subject: [PATCH 2/2] feat: support engines --- lib/data_migrate/data_migrator_five.rb | 2 +- .../data_migration/data_migration_generator_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/data_migrate/data_migrator_five.rb b/lib/data_migrate/data_migrator_five.rb index 67c3bbab..1ec6a4cd 100644 --- a/lib/data_migrate/data_migrator_five.rb +++ b/lib/data_migrate/data_migrator_five.rb @@ -6,7 +6,7 @@ module DataMigrate class DataMigrator < ActiveRecord::Migrator def self.migrations_paths - [DataMigrate.config.data_migrations_path] + Array.wrap(DataMigrate.config.data_migrations_path) end def self.assure_data_schema_table diff --git a/spec/generators/data_migration/data_migration_generator_spec.rb b/spec/generators/data_migration/data_migration_generator_spec.rb index aa870651..cc773aad 100644 --- a/spec/generators/data_migration/data_migration_generator_spec.rb +++ b/spec/generators/data_migration/data_migration_generator_spec.rb @@ -31,7 +31,7 @@ context 'when custom data migrations path has a trailing slash' do before do - DataMigrate.config.data_migrations_path = 'abc/' + DataMigrate.config.data_migrations_gen_path = 'abc/' end it 'returns correct file path' do @@ -45,7 +45,7 @@ context 'when custom data migrations path does not have a trailing slash' do before do - DataMigrate.config.data_migrations_path = 'abc' + DataMigrate.config.data_migrations_gen_path = 'abc' end it 'returns correct file path' do