master_data_tool 0.9.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1a8cf7753997cee7c6508d745c9eb9152261ea433dcd0ea436bd9684d2b57c
-  data.tar.gz: ae108bb9da67df2a46e15335cc7930a6568a0e359d599323e24683bc3db761c4
+  metadata.gz: 69795950505c4ab8feeb32605e77d588da3922793d21e2eeb59995c6a3ac2238
+  data.tar.gz: dd153019b32a9808bc5c8da0f6dba8add7ffcb753f85940882efce22a2aac3b5
 SHA512:
-  metadata.gz: be594e338ccd11ec1bb9621452c6ff1b0834c253326b74b89fd0f4e7285b3f040f5948f69cde7eae6028581503bf37f26ba8ce0950e7543184b529f44ec51e55
-  data.tar.gz: a3ceed39c0d391fb2ec5774371b54f66e25a7d3dc52fff323fd8235edb6e3d750022909782e482fa347ec950b55b2e75722440f3ce613569e7fd134a4b012069
+  metadata.gz: 2107f256a35f5a8ad8e9a9cfb8f6b668e9518b185eeb91a42b4aac7b56695841abf1f627a1c182e0afc6f06a441c2b5569c5f9e62985d76f76d89f30c5a37d2d
+  data.tar.gz: 587736de3714b372e702e9338a6dfa6e45c44251fcf584b1d0c117a7bca8120cb12a9c97a9635ccaad34e0dd6693e5149253ac20a7201802f9b84f572bc474bd

data/README.md

@@ -45,6 +45,7 @@ Or install it yourself as:
 | --except-verify-tables | [] | 指定したテーブルのバリデーションチェックを行わない         |
 | --skip-no-change     | true | CSVファイルに更新がないテーブルをスキップする          |
 | --silent | false | 結果の出力をやめる                         |
+| --delete-all-ignore-foreign-key | false | 外部キー制約を無視してレコードを消すかどうか |
 
 ```bash
 bundle exec master_data_tool import
@@ -61,7 +62,8 @@ bundle exec thor master_data_tool import \
   --only-verify-tables="" \
   --except-verify-tables="" \
   --skip-no-change=true \
-  --silent=false
+  --silent=false \
+  --delete-all-ignore-foreign-key=false
 ```
 
 ### ダンプ

data/exe/master_data_tool

@@ -9,35 +9,19 @@ require environment_path
 
 module MasterDataTool
   class CLI < Thor
-    option :dry_run, default: true, type: :boolean
-    option :verify, default: true, type: :boolean
-    option :only_import_tables, default: [], type: :array
-    option :except_import_tables, default: [], type: :array
-    option :only_verify_tables, default: [], type: :array
-    option :except_verify_tables, default: [], type: :array
-    option :skip_no_change, default: true, type: :boolean
-    option :silent, default: false, type: :boolean
+    option :dry_run, default: nil, type: :boolean
+    option :verify, default: nil, type: :boolean
+    option :only_import_tables, default: nil, type: :array
+    option :except_import_tables, default: nil, type: :array
+    option :only_verify_tables, default: nil, type: :array
+    option :except_verify_tables, default: nil, type: :array
+    option :skip_no_change, default: nil, type: :boolean
+    option :silent, default: nil, type: :boolean
+    option :delete_all_ignore_foreign_key, default: nil, type: :boolean
     desc 'import', 'import'
     def import
-      dry_run = options[:dry_run]
-      verify = options[:verify]
-      only_import_tables = options[:only_import_tables]
-      except_import_tables = options[:except_import_tables]
-      only_verify_tables = options[:only_verify_tables]
-      except_verify_tables = options[:except_verify_tables]
-      skip_no_change = options[:skip_no_change]
-      silent = options[:silent]
-
-      executor = MasterDataTool::Import::Executor.new(
-        dry_run: dry_run,
-        verify: verify,
-        only_import_tables: only_import_tables,
-        except_import_tables: except_import_tables,
-        only_verify_tables: only_verify_tables,
-        except_verify_tables: except_verify_tables,
-        skip_no_change: skip_no_change,
-        silent: silent
-      )
+      new_options = MasterDataTool.config.default_import_options.with_indifferent_access.merge(options)
+      executor = MasterDataTool::Import::Executor.new(**new_options.symbolize_keys)
       executor.execute
     end
 

data/lib/master_data_tool/config.rb

@@ -7,15 +7,15 @@ module MasterDataTool
     config_accessor :master_data_dir
     config_accessor :dump_ignore_tables
     config_accessor :dump_ignore_columns
+    config_accessor :default_import_options
     config_accessor :logger
 
-    def self.default_config
-      new.tap do |config|
-        config.master_data_dir = nil # Rails.root.join('db/fixtures')
-        config.dump_ignore_tables = %w[]
-        config.dump_ignore_columns = %w[]
-        config.logger = Logger.new(nil)
-      end
+    def initialize
+      self.master_data_dir = nil
+      self.dump_ignore_tables = %w[]
+      self.dump_ignore_columns = %w[]
+      self.default_import_options = {}
+      self.logger = Logger.new(nil)
     end
   end
 end

data/lib/master_data_tool/import/executor.rb

@@ -11,6 +11,7 @@ module MasterDataTool
                      except_verify_tables: [],
                      skip_no_change: true,
                      silent: false,
+                     delete_all_ignore_foreign_key: false,
                      report_printer: MasterDataTool::Report::DefaultPrinter.new)
 
         @dry_run = dry_run
@@ -21,12 +22,15 @@ module MasterDataTool
         @except_verify_tables = Array(except_verify_tables)
         @skip_no_change = skip_no_change
         @silent = silent
+        @delete_all_ignore_foreign_key = delete_all_ignore_foreign_key
         @report_printer = report_printer
         @report_printer.silent = silent
       end
 
       def execute
         ApplicationRecord.transaction do
+          print_execute_options
+
           master_data_list = build_master_data_list
 
           import_all!(master_data_list)
@@ -45,6 +49,14 @@ module MasterDataTool
 
       private
 
+      def print_execute_options
+        puts "==== execute ===="
+        instance_variables.each do |k|
+          puts "#{k}: #{instance_variable_get(k)}"
+        end
+        puts "================="
+      end
+
       def build_master_data_list
         [].tap do |master_data_list|
           extract_master_data_csv_paths.each do |path|
@@ -57,7 +69,7 @@ module MasterDataTool
 
             master_data_list << master_data
           end
-        end
+        end.sort_by { |m| m.csv_path } # 外部キー制約などがある場合には先に入れておかないといけないデータなどがある。なので、プレフィックスを付けて順序を指定して貰う
       end
 
       def import_all!(master_data_list)
@@ -65,7 +77,7 @@ module MasterDataTool
           next unless master_data.loaded?
           next if import_skip_table?(master_data.table_name)
 
-          report = master_data.import!(dry_run: @dry_run)
+          report = master_data.import!(dry_run: @dry_run, delete_all_ignore_foreign_key: @delete_all_ignore_foreign_key)
           report.print(@report_printer)
         end
       end

data/lib/master_data_tool/master_data.rb

@@ -103,14 +103,16 @@ module MasterDataTool
       @model_klass.table_name
     end
 
-    def import!(dry_run: true)
+    def import!(dry_run: true, delete_all_ignore_foreign_key: false)
       raise MasterDataTool::NotLoadedError unless @loaded
 
       MasterDataTool::Report::ImportReport.new(self).tap do |report|
         return report if dry_run
         return report unless affected?
 
+        disable_foreign_key_checks if delete_all_ignore_foreign_key
         @model_klass.delete_all
+        enable_foreign_key_checks if delete_all_ignore_foreign_key
 
         # マスターデータ間の依存がある場合に投入順制御するのは大変なのでこのタイミングでのバリデーションはしない
         @model_klass.import(import_records, validate: false, on_duplicate_key_update: @columns, timestamps: true)
@@ -119,7 +121,7 @@ module MasterDataTool
 
     def verify!(ignore_fail: false)
       MasterDataTool::Report::VerifyReport.new(self).tap do |report|
-        @model_klass.order(id: :asc).all.find_each do |record|
+        @model_klass.all.find_each do |record|
           valid = record.valid?
           report.append(MasterDataTool::Report::VerifyReport.build_verify_record_report(self, record, valid))
           next if ignore_fail
@@ -152,5 +154,13 @@ module MasterDataTool
         end
       end
     end
+
+    def enable_foreign_key_checks
+      ApplicationRecord.connection.execute('SET FOREIGN_KEY_CHECKS = 1')
+    end
+
+    def disable_foreign_key_checks
+      ApplicationRecord.connection.execute('SET FOREIGN_KEY_CHECKS = 0')
+    end
   end
 end

data/lib/master_data_tool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MasterDataTool
-  VERSION = "0.9.0"
+  VERSION = "0.12.0"
 end

data/lib/master_data_tool.rb

@@ -17,7 +17,7 @@ module MasterDataTool
 
   class << self
     def config
-      @config ||= Config.default_config
+      @config ||= Config.new
     end
 
     def configure
@@ -25,7 +25,8 @@ module MasterDataTool
     end
 
     def resolve_table_name(csv_path)
-      csv_path.relative_path_from(config.master_data_dir).to_s.delete_suffix('.csv')
+      # 0001_table_nameのように投入順序を制御可能にする
+      csv_path.relative_path_from(config.master_data_dir).to_s.gsub(/^\d+_/, '').delete_suffix('.csv')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_data_tool
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -205,7 +205,6 @@ files:
 - lib/master_data_tool/report/verify_report.rb
 - lib/master_data_tool/version.rb
 - log/test.log
-- master_data_tool.gemspec
 - scripts/setup.sh
 - sig/master_data_tool.rbs
 homepage: https://github.com/taka0125/master_data_tool
@@ -228,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: マスタデータの管理ツール

data/master_data_tool.gemspec

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/master_data_tool/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "master_data_tool"
-  spec.version = MasterDataTool::VERSION
-  spec.authors = ["Takahiro Ooishi"]
-  spec.email = ["taka0125@gmail.com"]
-
-  spec.summary = "マスタデータの管理ツール"
-  spec.description = "システムが稼働する上で最初から必要なデータ（マスタデータ）を管理するツールです。"
-  spec.homepage = "https://github.com/taka0125/master_data_tool"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'psych', '~> 3.1'
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'ridgepole'
-  spec.add_development_dependency 'database_cleaner-active_record'
-  spec.add_development_dependency 'standalone_activerecord_boot_loader'
-
-  spec.add_dependency 'activerecord', '>= 5.1.7'
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'activerecord-import'
-end