arxutils_sqlite3 0.1.54 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b6c2964eb5bd59b6601706fdb9085d50353be9df04ba6b83995e1c9b617707
-  data.tar.gz: 3c366bd4cddb2287a82ad9f184a465c9953323699108eab8849ecadb10f8f11f
+  metadata.gz: 6c61855dd1cb824e99683ddbe8ea74085dccfdceb07daf5d875c17ae970ba764
+  data.tar.gz: 58b003297e61ab90072846de1b34836ac0a7461d3c611dee991224c6d07c0354
 SHA512:
-  metadata.gz: b9c7c00307a6063f7254478e8879a0f883b4bb369533cb738dadbb964723cc24f7460e1684e9ae61b201567f3a13f48c8cb0e357999c7cdc99224cb9d6d9acb8
-  data.tar.gz: 0f2c860830b7568161cede9212427412d1e9babe3426429541e425f5e032695976c2e8e91657c81f90e1ff47583f4920efadb37cb2c978da09c302d92b04aaa5
+  metadata.gz: 123d78945f9f2f2b8e23f944f111d069e92c94551523f51a13dce6e928722f031a3c399b66eb87be4973ec2f372bdb067ea78b36ea1df115d9382bccec9c70df
+  data.tar.gz: '08dcc25d6c3fc43b343ef65d08df6bdf789a6eed391f0af73deb5fbe348d8a8baca7a3086d19ab21bd42edd99cf1ab75c0d0b1da6012276c659589d99ff74292'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.54)
+    arxutils_sqlite3 (0.1.56)
       activerecord (~> 6.1)
       activesupport
       simpleoptparse

data/exe/arxutils_sqlite3

@@ -13,10 +13,10 @@ opts, klass = config.setupx(self)
 # p klass
 # exit
 
-banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b|y) -y yaml_file --klass=class"
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b|y|dm) -y yaml_file --klass=class"
 
 Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("--cmd X", %w[s cds co c f m a d b y]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s cds co c f m a d b y dm]) { |x| opts["cmd"] = x }
   parser.on("-y yaml_file", "--yaml yaml_file") { |x| opts["yaml"] = x }
   parser.on("--klass klass") { |x| opts["klass"] = x }
 end
@@ -25,7 +25,10 @@ dbconfig = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
 env = ENV.fetch("ENV", nil)
 env ||= "production"
 
-cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env)
+acrecord = opts[:acrecord]
+yaml_fname = opts["yaml"]
+klass = opts["klass"]
+cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env, acrecord, yaml_fname, klass)
 
 case opts["cmd"]
 when "s"
@@ -44,20 +47,16 @@ when "co"
   cli.copy_opts_file
 
 when "c"
-  acrecord = opts[:acrecord]
-  cli.makeconfig(acrecord, banner, 30, opts)
+  cli.makeconfig(opts)
 
 when "f"
-  yaml_fname = opts["yaml"]
-  acrecord = opts[:acrecord]
   if yaml_fname.nil? || yaml_fname.strip == ""
     puts banner
     exit 40
   end
   yaml_pn = Pathname.new(yaml_fname)
   config.check_file_not_exist(yaml_pn, banner, 55)
-  cli.setup_for_migrate(yaml_pn, acrecord, klass)
-
+  cli.make_migrate_script
 when "m"
   cli.migrate
 
@@ -65,17 +64,17 @@ when "a"
   cli.acr
 
 when "d"
-  db_scheme_ary = nil
-  acrecord = opts["acrecord"]
-  cli.delete(db_scheme_ary, acrecord)
+  cli.delete
 
 when "b"
-  db_scheme_ary = nil
-  acrecord = opts["acrecord"]
-  cli.delete_db(db_scheme_ary, acrecord)
+  cli.delete_db
 
 when "y"
   cli.delete_setting_yaml
+
+when "dm"
+  cli.delete_migrate
+
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/cli.rb

@@ -1,10 +1,23 @@
 module Arxutils_Sqlite3
   # CLI用クラス
   class Cli
-    def initialize(config, dbconfig, env)
+    def initialize(config, dbconfig, env, acrecord, yaml_fname, klass)
       @config = config
       @dbconfig = dbconfig
       @env = env
+      @acrecord = acrecord
+      @dbconfig_path = @config.make_dbconfig_path(@dbconfig)
+
+      @db_scheme_ary = nil
+      if yaml_fname && yaml_fname.strip != ""
+        yaml_pn = Pathname.new(yaml_fname)
+        @db_scheme_ary = YAML.load_file(yaml_pn)
+      end
+      @mig = @config.prepare_for_migrate(@db_scheme_ary, @dbconfig_path, @dbconfig, @acrecord)
+    end
+
+    def setup_for_migrate(yaml_pn, klass)
+
     end
 
     def setup(klass)
@@ -29,24 +42,22 @@ module Arxutils_Sqlite3
       @config.copy_opts_file
     end
 
-    def makeconfig(acrecord, _banner, _exit_code, opts)
+    def setup_for_migrate
       db_scheme_ary = nil
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
       # @config.check_file_exist(dbconfig_path, banner, exit_code)
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
-      mig.make_dbconfig(opts)
+      @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, @acrecord)
     end
 
-    def setup_for_migrate(yaml_pn, acrecord, klass)
-      db_scheme_ary = YAML.load_file(yaml_pn)
-      dbconfig_path = @config.make_dbconfig_path(@dbconfig)
-
-      dest_dbsetup_file = @config.dest_dbsetup_file
-      @config.make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
+    def makeconfig(opts)
+      @mig.make_dbconfig(opts)
+    end
 
+    def make_migrate_script
+      @dest_dbsetup_file = @config.dest_dbsetup_file
+      @config.make_dbsetup_file(@db_scheme_ary, @acrecord, @klass, @dest_dbsetup_file)
       # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
-      mig.output
+      @mig.output
     end
 
     # マイグレーション実行
@@ -75,25 +86,26 @@ module Arxutils_Sqlite3
       ret
     end
 
-    def delete(db_scheme_ary, acrecord)
-      config_dir = @config.config_dir
-      dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, @dbconfig)
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
-      mig.delete_migrate_and_config_and_db
+    def delete
+      @mig.delete_migrate_and_config_and_db
+    end
+
+    def delete_db
+      @mig.delete_db
     end
 
-    def delete_db(db_scheme_ary, acrecord)
-      config_dir = @config.config_dir
-      dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, @dbconfig)
-      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
-      # mig.delete_migrate_config_and_db
-      mig.delete_db
+    def delete_nigrate
+      @mig.delete_migrate
     end
 
     def delete_setting_yaml
       FileUtils.rm_f(@config.setting_yaml_file)
     end
 
+    def delete_migrate
+      @mig.delete_migrate
+    end
+
     def rm_dbconfig
       dbconfig_path = @config.make_dbconfig_path(@dbconfig)
       # p dbconfig_path

data/lib/arxutils_sqlite3/migrate.rb

@@ -85,7 +85,6 @@ module Arxutils_Sqlite3
     # DBファイルの削除
     def delete_db
       Dir.glob(File.join(@db_dir, "*")).each do |x|
-        # puts x
         FileUtils.rm(x) if File.file?(x)
       end
     end

data/lib/arxutils_sqlite3/rake_task.rb

@@ -80,3 +80,8 @@ desc "delete setting yaml"
 task "arx:delete_setting" do
   sh "bundle exec arxutils_sqlite3 --cmd=y"
 end
+
+desc "delete migrate scripts"
+task "arx:delete_migrate" do
+  sh "bundle exec arxutils_sqlite3 --cmd=dm"
+end

data/lib/arxutils_sqlite3/version.rb

@@ -1,4 +1,4 @@
 module Arxutils_Sqlite3
   # バージョン番号
-  VERSION = "0.1.54".freeze
+  VERSION = "0.1.56".freeze
 end

data/lib/dbacrecord.rb

@@ -14,12 +14,12 @@ module Dbutil
   end
 
   class Invalidxenoplist < ActiveRecord::Base
-    belongs_to :xenoplist, foreign_key: 'org_id'
-    belongs_to :count, foreign_key: ''
+    belongs_to :xenoplist, foreign_key: "org_id"
+    belongs_to :count, foreign_key: ""
   end
 
   class Currentxenoplist < ActiveRecord::Base
-    belongs_to :xenoplist , foreign_key: 'org_id'
+    belongs_to :xenoplist, foreign_key: "org_id"
   end
 
 end

data/lib/template/acrecord/acrecord_current.tmpl

@@ -1,3 +1,3 @@
   class Current<%= @data[:classname_downcase] %> < ActiveRecord::Base
-    belongs_to :<%= @data[:classname_downcase] %> , foreign_key: 'org_id'
+    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: "org_id"
   end

data/lib/template/acrecord/acrecord_invalid.tmpl

@@ -1,4 +1,4 @@
   class Invalid<%= @data[:classname_downcase] %> < ActiveRecord::Base
-    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: 'org_id'
-    belongs_to :<%= @data[:count_classname_downcase] %>, foreign_key: '<%= @data[:count_field] %>'
+    belongs_to :<%= @data[:classname_downcase] %>, foreign_key: "org_id"
+    belongs_to :<%= @data[:count_classname_downcase] %>, foreign_key: "<%= @data[:count_field] %>"
   end

data/lib/template/acrecord/base.tmpl

@@ -1,7 +1,7 @@
 class Create<%= @data[:classname] %> < ActiveRecord::Migration[<%= @data[:ar_version] %>]
   def self.up
     create_table :<%= @data[:plural] %> do |t|
-<% @data[:ary].each do |x| %>    
+<% @data[:ary].each do |x| %>
       t.column :<%= x.name %>, :<%= x.type %>, :null => <%= x.null %>
 <% end %>
       t.timestamps  null: false

data/lib/template/acrecord/current.tmpl

@@ -2,7 +2,7 @@ class CreateCurrent<%= @data[:classname_downcase] %> < ActiveRecord::Migration[<
   def self.up
     execute <<-SQL
       CREATE VIEW current<%= @data[:plural] %> AS SELECT id as org_id,
-<%= @data[:ary].map{|x| x.name }.join(" , ") %>    
+<%= @data[:ary].map{|x| x.name }.join(" , ") %>
       FROM <%= @data[:plural] %> where not exists (select * from invalid<%= @data[:plural] %> where invalid<%= @data[:plural] %>.org_id = <%= @data[:plural] %>.id )
     SQL
   end

data/lib/template/acrecord/db_scheme/dbsetup.tmpl

@@ -1,9 +1,9 @@
-require_relative '../lib/dbacrecord'
+require_relative "../lib/dbacrecord"
 
 class Dbsetup
   def initialize(connect_time)
     @connect_time = connect_time
-    @ct = <%= klass %>::Dbutil::Countdatetime.create( countdatetime: @connect_time )
+    @ct = <%= klass %>::Dbutil::Countdatetime.create(countdatetime: @connect_time)
     @hs_by_notebook = {}
     @hs_by_id = {}
   end

data/lib/template/acrecord/noitem.tmpl

@@ -1,9 +1,9 @@
 class Create<%= @data[:classname] %> < ActiveRecord::Migration[<%= @data[:ar_version] %>]
   def self.up
     create_table :<%= @data[:plural] %> do |t|
-<% @data[:ary].each do |x| %>    
+<% @data[:ary].each do |x| %>
       t.column :<%= x.name %>, :<%= x.type %>, :null => <%= x.null %>
-<% end %>    
+<% end %>
     end
   end
 

data/memo.md

@@ -0,0 +1,7 @@
+```mermaid
+graph TD;
+    Cli#makeconfig-->config.prepare_for_migrate;
+    Cli#delete-->config.prepare_for_migrate;
+    Cli#delete_db-->config.prepare_for_migrate;
+    Cli#delete_migrate-->config.prepare_for_migrate;
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.54
+  version: 0.1.56
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,6 +243,7 @@ files:
 - lib/template/acrecord/noitem.tmpl
 - lib/template/config/mysql.tmpl
 - lib/template/config/sqlite3.tmpl
+- memo.md
 homepage: https://ykominami.github.io/arxutils_sqlite3/
 licenses:
 - MIT