arxutils_sqlite3 0.1.47 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09dc03b438aa54a9f0bb3e49c46b7592593e52a4e4275220a1b66890694054e
-  data.tar.gz: 1afd929a60c9e1fed27e11b9ff4ea87761be5dd77e15cf87cb2e090a153dbc07
+  metadata.gz: c193545ee59fccd118a5b0e5cac8cc391156e418a62ef8b16bfe15c68cc99671
+  data.tar.gz: 20995c46c24a772caa0e638089473ad4f1c703c5c98f003cb6c47c975a9d5a88
 SHA512:
-  metadata.gz: 3f63fa45e2827cc7c16ae8fc534c2ef725e1359c4d2c9f99c4edc73af78b846eaf43319c25cb177636cffef8d997fc939e6d97e865ece6ea0a0a064d398d90df
-  data.tar.gz: 508aa3ff67bddd7e1ec59403e6f18d024f71e79dbd23aa750dd6c736bd3a3183091f7ec9fde7b61d634091dddf41ef5885f5d6b900fcb8c4eb5a97bdde077ed7
+  metadata.gz: a62e6f3d47ea1920a867c77a73d6f6fe667d4d438f8ba9fa5aec5edd7a2cd238e0dd6cf5a0a1d1468eea8b3f2369dcbfcb6cb420da51e7e21ec608f18521824f
+  data.tar.gz: 4435b54b4f7eb8f7d53707da7bd6caedd4a9c110af82f4f30573db1f9b51721a61c1debb65b65f94d1c6fffa7020722d0ad1d5a0c24152479ced7164479d4238

data/Rakefile

@@ -1,65 +1,102 @@
 require "bundler/gem_tasks"
-=begin
 require "rake/testtask"
 
 Rake::TestTask.new do |t|
   t.libs  << "test"
 end
 
-desc "Run test"
-task default: :test
-=end
+#desc "Run test"
+#task default: :test
 
-# Defining a task called default that depends on the tasks setup, makeconfig, migrate, and integrate.
-task default: %w[delete setup makeconfig migrate integrate]
+# Defining a task called default that depends on the tasks setup, makeconfig, migrate, and acr.
 
-task scmi: %w[setup makeconfig migrate integrate]
+desc "setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
+task default: %w[setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr]
 
+desc "delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
+task bootstrap: %w[delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr]
+
+desc "setup makeconfig migrate acr"
+task scfma: %w[setup makeconfig migrate acr]
+
+desc "delete setup makeconfig"
 task dsc: %w[delete setup makeconfig]
 
+desc "delete setup"
 task ds: %w[delete setup]
 
+desc "setup"
 task s: %w[setup]
 
+desc "setup makeconfig"
 task sc: %w[setup makeconfig]
 
+desc "delete setup makeconfig migrate"
 task dscm: %w[delete setup makeconfig migrate]
 
+desc "setup makeconfig migrate"
 task scm: %w[setup makeconfig migrate]
 
-task dscmi: %w[delete setup makeconfig migrate integrate]
+desc "delete setup makeconfig migrate acr"
+task dscma: %w[delete setup makeconfig migrate acr]
 
-task scmi: %w[setup makeconfig migrate integrate]
+desc "setup makeconfig migrate acr"
+task scma: %w[setup makeconfig migrate acr]
 
-task mi: %w[migrate integrate]
+desc "migrate acr"
+task ma: %w[migrate acr]
 
-task bmi: %w[delete_db migrate integrate]
+desc "delete_db migrate acr"
+task bma: %w[delete_db migrate acr]
 
+desc "delete_db"
 task b: %w[delete_db]
 
 # コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
 # プトファイルの生成
+desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name Enop"
 task :setup do
   sh "bundle exec arxutils_sqlite3 --cmd=s --klass=Enop"
 end
 
+desc "copy from db_scheme.yml.sample to db_scheme.yml"
+task :copy_db_scheme do
+  sh "bundle exec arxutils_sqlite3 --cmd=cds"
+end
+
+desc "copy from opts.rb.sample to opts.rb"
+task :copy_opts do
+  sh "bundle exec arxutils_sqlite3 --cmd=co"
+end
+
 # DB構成情報の生成
+desc "produce sqlite3.yml"
 task :makeconfig do
   sh "bundle exec arxutils_sqlite3 --cmd=c"
 end
-# マイグレート用スクリプトファイルの生成とマイグレートの実行
+
+# マイグレート用スクリプトファイルの生成
+desc "produce migration scripts"
+task :make_migrate_script do
+  sh "bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml"
+end
+# マイグレートの実行
+desc "execute migration"
 task :migrate do
-  sh "bundle exec arxutils_sqlite3 --cmd=m --yaml=config/db_scheme.yml"
+  sh "bundle exec arxutils_sqlite3 --cmd=m"
 end
 
-task :integrate do
-  sh "bundle exec arxutils_sqlite3 --cmd=i"
+desc "call ActiveRecord instance method"
+task :acr do
+  sh "bundle exec arxutils_sqlite3 --cmd=a"
 end
 
+desc "delete configuration files adn migration scripts and db files"
 task :delete do
   sh "bundle exec arxutils_sqlite3 --cmd=d"
 end
 
+desc "delete db files"
 task :delete_db do
   sh "bundle exec arxutils_sqlite3 --cmd=b"
 end

data/arxutils_sqlite3.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   # spec.add_runtime_dependency "erb"
   # spec.add_runtime_dependency "activerecord", "~> 4.2"
+
   spec.add_runtime_dependency "activerecord", "~> 6.1"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "ykutils"
@@ -43,10 +44,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "simpleoptparse"
   # spec.add_development_dependency "bundler", "~> 2.2.10"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  #spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rspec" , "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "yard"

data/exe/arxutils_sqlite3

@@ -10,12 +10,21 @@ config = Arxutils_Sqlite3::Config.new
 
 config.require_opts_file
 
-begin
-  require "dbrelation"
-rescue LoadError => ex
-  pp ex.message
+opts = @opts ? @opts : {}
+
+acrecord = opts[:acrecord]
+if acrecord
+  filename = acrecord[:filename]
+  basename = File.basename(filename)
+
+  begin
+    require "#{basename}"
+  rescue LoadError => ex
+    #pp ex.message
+  end
 end
 
+opts[:db_dir] = Arxutils_Sqlite3::Config::DB_DIR
 
 klass = nil
 setting = config.load_setting_yaml_file
@@ -24,105 +33,67 @@ klass = setting[:klass]
 # DBセットアップクラス
 config.require_dbsetup_file
 
-banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|c|m|i|d|b) -y yaml_file --klass=class"
-
-opts = @opts ? @opts : {}
-opts["dbconfig"] = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
+banner = "Usage: bundle exec arxutils_sqlite3 --cmd=(s|cds|co|c|f|m|a|d|b) -y yaml_file --klass=class"
 
 Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSION, nil) do |parser|
-  parser.on("--cmd X", %w[s c m i d b]) { |x| opts["cmd"] = x }
+  parser.on("--cmd X", %w[s cds co c f m a d b]) { |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
+klass = opts["klass"] if opts["klass"]
 
+dbconfig = Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3
 env = ENV.fetch("ENV", nil)
 env ||= "production"
 
+cli = Arxutils_Sqlite3::Cli.new(config, dbconfig, env)
+
 case opts["cmd"]
 when "s"
-  config.check_file_exist(Arxutils_Sqlite3::Config::DEST_OPTS_FILE, banner, 10)
+  #config.check_file_exist(Arxutils_Sqlite3::Config::SAMPLE_DEST_OPTS_FILE, banner, 10)
 
   if opts["klass"].nil? || opts["klass"].strip == ""
     puts banner
     exit 20
   end
-  klass = opts["klass"]
-  config.make_config_directory
-  config.setup_db_scheme_file
-  config.setup_opts_file(klass)
-  config.setup_setting_yaml_file(klass)
-  db_scheme_ary = nil
+  cli.setup(klass)
+
+when "cds"
+  cli.copy_db_scheme
+
+when "co"
+  cli.copy_opts_file
 
 when "c"
-  db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  replation = opts["replation"]
-  dbconfig_path = config.make_dbconfig_path(dbconfig)
-  config.check_file_exist(dbconfig_path, banner, 30)
-  mig = config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, replation)
-  mig.make_dbconfig(opts)
+  acrecord = opts[:acrecord]
+  cli.makeconfig(acrecord, banner, 30, opts)
 
-when "m"
+when "f"
   yaml_fname = opts["yaml"]
-  relation = opts[:relation]
-  dbconfig = opts["dbconfig"]
+  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)
-  db_scheme_ary = YAML.load_file( yaml_pn )
+  cli.setup_for_migrate(yaml_pn, acrecord, klass)
 
-  dest_dbsetup_file = config.get_dest_dbsetup_file
-  config.make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
-
-  connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(config, dbconfig, env)
-
-  # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
-  mig = config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
-  mig.output
-
-  # マイグレーション実行
-  ActiveRecord::MigrationContext.new(mig.migrate_dir, ActiveRecord::SchemaMigration).up
+when "m"
+  cli.migrate
 
-when "i"
-  dbconfig = opts["dbconfig"]
-  connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(config, dbconfig, env)
-  Dbsetup.new(connect_time)
+when "a"
+  cli.acr
 
 when "d"
   db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  replation = opts["replation"]
-
-  config_dir = config.get_config_dir
-  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
-  mig = config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, replation)
-  mig.delete_migrate_and_config_and_db
+  acrecord = opts["acrecord"]
+  cli.delete(db_scheme_ary, acrecord)
 
 when "b"
   db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  replation = opts["replation"]
-
-  config_dir = config.get_config_dir
-  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
-  mig = config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, replation)
-  # mig.delete_migrate_config_and_db
-  mig.delete_db
-
-when "b"
-  db_scheme_ary = nil
-  dbconfig = opts["dbconfig"]
-  replation = opts["replation"]
-
-  config_dir = config.get_config_dir
-  dbconfig_path = Arxutils_Sqlite3::Util.make_dbconfig_path(config_dir, dbconfig)
-  mig = config.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, replation)
-  # mig.delete_migrate_config_and_db
-  mig.delete_db
-
+  acrecord = opts["acrecord"]
+  cli.delete_db(db_scheme_ary, acrecord)
 else
   puts "Invalid command(#{opts["cmd"]}) specified!!"
 end

data/lib/arxutils_sqlite3/arx.rb

@@ -1,5 +1,6 @@
 require "erb"
 require "ykutils"
+
 module Arxutils_Sqlite3
   # スキーマ設定に基づき、テンプレートから変換する
   class Arx
@@ -17,7 +18,7 @@ module Arxutils_Sqlite3
       # :items
       #  フィールド名, 型, null許容 の配列
       # :plural
-      # :relation
+      # :acrecord
       @data = data
 
       # スキーマ設定の:itemsの値を展開後格納するためのStructクラス

data/lib/arxutils_sqlite3/cli.rb

@@ -0,0 +1,90 @@
+module Arxutils_Sqlite3
+  # CLI用クラス
+  class Cli
+    def initialize(config, dbconfig, env)
+      @config = config
+      @dbconfig = dbconfig
+      @env = env
+    end
+
+    def setup(klass)
+      p "make_config_directory"
+      @config.make_config_directory
+      p "setup_db_scheme_file"
+      @config.setup_db_scheme_file
+      p "setup_opts_file(#{klass})"
+      @config.setup_opts_file(klass)
+      p "setup_setting_yaml_file(#{klass})"
+      @config.setup_setting_yaml_file(klass)
+      #db_scheme_ary = nil
+    end
+
+    def copy_db_scheme
+      # DBスキームファイルが存在しなければ、サンプルファイルをDBスキームファイルとしてコピー
+      @config.copy_db_scheme_file
+    end
+
+    def copy_opts_file
+      # optsファイルが存在しなければ、サンプルファイルをoptsファイルとしてコピー
+      @config.copy_opts_file
+    end
+
+    def makeconfig(acrecord, banner, exit_code, opts)
+      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)
+    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.get_dest_dbsetup_file
+      @config.make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
+
+      # migrate用スクリプトの出力先ディレクトリ名
+      migrate_dir = @config.get_migrate_dir
+      # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
+      mig = @config.prepare_for_migrate(db_scheme_ary, dbconfig_path, @dbconfig, acrecord)
+      mig.output
+    end
+
+    def migrate
+      # migrate用スクリプトの出力先ディレクトリ名
+      migrate_dir = @config.get_migrate_dir
+
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
+
+      # マイグレーション実行
+      ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
+    end
+
+    def acr
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, @dbconfig, @env)
+      Dbsetup.new(connect_time)
+    end
+
+    def delete(db_scheme_ary, acrecord)
+      config_dir = @config.get_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
+    end
+
+    def delete_db(db_scheme_ary, acrecord)
+      config_dir = @config.get_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
+    end
+
+    def rm_dbconfig
+      dbconfig_path = @config.make_dbconfig_path(@dbconfig)
+      #p dbconfig_path
+      FileUtils.rm_f(dbconfig_path)
+    end
+  end
+end

data/lib/arxutils_sqlite3/config.rb

@@ -22,19 +22,22 @@ module Arxutils_Sqlite3
     # テンプレートディレクトリへのパス
     TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join("template")
     # リレーションテンプレートディレクトリへのパス
-    TEMPLATE_RELATION_DIR = TEMPLATE_DIR.join("relation")
+    TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join("acrecord")
     TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join( CONFIG_DIR )
-    DB_SCHEME_DIR = TEMPLATE_RELATION_DIR.join("db_scheme")
+    DB_SCHEME_DIR = TEMPLATE_ACRECORD_DIR.join("db_scheme")
     DB_SCHEME_FILE = DB_SCHEME_DIR.join("db_scheme.yml")
+    SAMPLE_DB_SCHEME_FILE = CONFIG_DIR.join("db_scheme.yml.sample")
     DB_SCHEME_FILE_NAME = "db_scheme.yml".freeze
     DB_SCHEME_FILE_NAME_2 = "db_scheme".freeze
     OPTS_FILE_NAME = "opts.rb".freeze
+    SAMPLE_OPTS_FILE_NAME = "opts.rb.sample".freeze
     OPTS_FILE_NAME_2 = "opts".freeze
     DBSETUP_FILE_NAME = "dbsetup.rb".freeze
     DBSETUP_FILE_NAME_2 = "dbsetup".freeze
     SETTING_YAML_FILE_NAME = "setting.yml".freeze
     DEST_CONFIG_DIR = Pathname.new( CONFIG_DIR )
     OPTS_FILE = DB_SCHEME_DIR.join(OPTS_FILE_NAME)
+    SAMPLE_OPTS_FILE = CONFIG_DIR.join(SAMPLE_OPTS_FILE_NAME)
     # 変換先Dbsetupクラス定義のRubyスクリプトファイルへのパス
     DBSETUP_FILE = DB_SCHEME_DIR.join(DBSETUP_FILE_NAME)
     # 変換先optsファイル(Rubyスクリプトファイル)へのパス
@@ -54,24 +57,44 @@ module Arxutils_Sqlite3
 
     # DB構成ファイル格納ディレクトリの作成
     def make_config_directory
+      p "config make_config_directory"
       FileUtils.mkdir_p(CONFIG_DIR)
     end
 
-    # DBスキームファイルのひな型コピー
+    # DBスキームファイルのサンプルファイルコピー
     def setup_db_scheme_file
-      FileUtils.cp(DB_SCHEME_FILE,  DEST_DB_SCHEME_FILE)
+      p "config setup_db_scheme_file"
+      p "DB_SCHEME_FILE=#{DB_SCHEME_FILE}"
+      p "SAMPLE_DB_SCHEME_FILE=#{SAMPLE_DB_SCHEME_FILE}"
+      FileUtils.cp(DB_SCHEME_FILE,  SAMPLE_DB_SCHEME_FILE)
     end
 
-    # optsファイル(Rubyスクリプトファイル)のrequire
+    # DBスキームファイルが存在しなければ、サンプルファイルをDBスキームファイルとしてコピー
+    def copy_db_scheme_file
+      if !File.exist?(DEST_DB_SCHEME_FILE)
+        FileUtils.cp(SAMPLE_DB_SCHEME_FILE,  DEST_DB_SCHEME_FILE)
+      end
+    end
+
+    # optsファイル(Rubyスクリプトファイル)のサンプルファイル書き込み
     def setup_opts_file(klass)
       scope = Object.new
       hash = {klass: klass}
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(OPTS_FILE, scope, hash)
-      File.open(DEST_OPTS_FILE, "w"){|file|
+      File.open(SAMPLE_OPTS_FILE, "w"){|file|
         file.write(result_content)
       }
     end
 
+    # optsファイルが存在しなければ、サンプルファイルをoptsファイルとしてコピー
+    def copy_opts_file
+      if !File.exist?(DEST_OPTS_FILE)
+        p "exist? #{File.exist?(DEST_OPTS_FILE)}"
+        p "copy SAMPLE_OPTS_FILE(#{SAMPLE_OPTS_FILE}) to DEST_OPTS_FILE(#{DEST_OPTS_FILE})"
+        FileUtils.cp(SAMPLE_OPTS_FILE,  DEST_OPTS_FILE)
+      end
+    end
+
     # setting.ymlへの出力
     def setup_setting_yaml_file(klass)
       hash = { "klass": klass }
@@ -94,7 +117,7 @@ module Arxutils_Sqlite3
         begin
           require opts_file
         rescue LoadError => ex
-          pp ex.message
+          #pp ex.message
         end
       end
     end
@@ -116,7 +139,7 @@ module Arxutils_Sqlite3
       begin
         require dbsetup_file
       rescue LoadError => ex
-        pp ex.message
+        # pp ex.message
       end
     end
 
@@ -158,8 +181,8 @@ module Arxutils_Sqlite3
     end
 
     # リレーションテンプレートディレクトリへのパス
-    def get_template_relation_dir
-      TEMPLATE_RELATION_DIR
+    def get_template_acrecord_dir
+      TEMPLATE_ACRECORD_DIR
     end
 
     # テンプレートディレクトリへのパス
@@ -202,38 +225,40 @@ module Arxutils_Sqlite3
     end
 
     # migrate用スクリプトの生成
-    def make_migrate_script(db_scheme_ary, dbconfig_path, dbconfig, relation)
-      mig = Arxutils_Sqlite3::Util.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, relation)
-      # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
+    def make_migrate_script(db_scheme_ary, dbconfig_path, dbconfig, acrecord)
+      mig = Arxutils_Sqlite3::Util.prepare_for_migrate(db_scheme_ary, dbconfig_path, dbconfig, acrecord)
+      # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
       mig.output
     end
 
     # migrateの準備
-    def prepare_for_migrate(db_scheme_ary, dbconfig_dest_path, dbconfig, relation)
+    def prepare_for_migrate(db_scheme_ary, dbconfig_dest_path, dbconfig, acrecord)
       #db_dir = config.DB_DIR
       db_dir = get_db_dir
-      migrate_dir = get_migrate_dir
       # DB構成ファイルの出力先ディレクトリ
       dbconfig_src_fname = "#{dbconfig}.tmpl"
+      # migrate用スクリプトの出力先ディレクトリ名
+      migrate_dir = get_migrate_dir
+
       mig = Migrate.new(
         self,
         dbconfig_dest_path,
         dbconfig_src_fname,
         db_scheme_ary,
-        relation
-        )
+        acrecord,
+        migrate_dir
+      )
     end
 
-    def make_dbsetup_file(db_scheme_ary, relation, klass, dest_dbsetup_file)
+    def make_dbsetup_file(db_scheme_ary, acrecord, klass, dest_dbsetup_file)
       src_dbsetup_file = get_src_dbsetup_file
 
       scope = Object.new
-      hash0 = {module_name: relation[:module].join("::")}
+      hash0 = {module_name: acrecord[:module].join("::")}
       hash = db_scheme_ary[0].merge( hash0 )
       hash["klass"] = klass
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(src_dbsetup_file, scope, hash)
 
-      #p "################ dest_dbsetup_file=#{dest_dbsetup_file}"
       File.open(dest_dbsetup_file, "w"){|file|
         file.write(result_content)
       }

data/lib/arxutils_sqlite3/migrate.rb

@@ -23,7 +23,8 @@ module Arxutils_Sqlite3
       dbconfig_dest_path,
       dbconfig_src_fname,
       db_scheme_ary,
-      relation_config
+      acrecord_config,
+      migrate_dir
       )
       # DB格納ディレクトリ名
       @db_dir = config.get_db_dir
@@ -34,18 +35,16 @@ module Arxutils_Sqlite3
       # 参照用DB構成情報ファイル名
       @dbconfig_src_fname = dbconfig_src_fname
 
-      # migrate用スクリプトの出力先ディレクトリ名
-      @migrate_dir = config.get_migrate_dir
       # テンプレートファイル格納ディレクトリ名
-      @src_path = config.get_template_relation_dir
-      #@src_path = Arxutils_Sqlite3::TEMPLATE_RELATION_DIR
+      @src_path = config.get_template_acrecord_dir
       # 構成ファイル格納ディレクトリ
       @src_config_path = config.get_template_config_dir
 #      @src_config_path = Arxutils_Sqlite3::TEMPLATE_CONFIG_DIR
       # データベーススキーマ定義配列
       @db_scheme_ary = db_scheme_ary
       # リレーション指定
-      @relation_config = relation_config
+      @acrecord_config = acrecord_config
+      @migrate_dir = migrate_dir
 
       FileUtils.mkdir_p(@db_dir) if @db_dir
       FileUtils.mkdir_p(@migrate_dir) if @migrate_dir
@@ -89,12 +88,12 @@ module Arxutils_Sqlite3
       end
     end
 
-    # マイグレーション用スクリプトの生成、relationのクラス定義ファイルの生成
+    # マイグレーション用スクリプトの生成、acrecordのクラス定義ファイルの生成
     def output
       # migrationのスクリプトをファイル出力する
       output_all_script
 
-      # relationを表すクラス定義のファイルの内容を生成
+      # acrecordを表すクラス定義のファイルの内容を生成
       content_array = make_content_array
       # p "content_array=#{content_array}"
       # 複数形のクラス名を集める
@@ -102,7 +101,7 @@ module Arxutils_Sqlite3
         x[:need_count_class_plural].nil?
       end
       need_count_class_plural = count_class_plurals.map { |x| x[:need_count_class_plural] }
-      # relationのmigrateが必要であれば、それをテンプレートファイルから作成して、スクリプトの内容として追加する
+      # acrecordのmigrateが必要であれば、それをテンプレートファイルから作成して、スクリプトの内容として追加する
       if content_array.find { |x| !x.nil? }
         # p "####### 1"
         data_count = {
@@ -111,12 +110,12 @@ module Arxutils_Sqlite3
         }
         # p "data_count=#{data_count}"
         ary = content_array.collect { |x| x[:content] }.flatten
-        count_content = convert_count_class_relation(data_count, "relation_count.tmpl")
+        count_content = convert_count_class_acrecord(data_count, "acrecord_count.tmpl")
         ary.unshift(count_content)
         content_array = ary
       end
-      # relationのスクリプトを作成
-      output_relation_script(content_array, @relation_config)
+      # acrecordのスクリプトを作成
+      output_acrecord_script(content_array, @acrecord_config)
     end
 
     # migrationのスクリプトをファイル出力する
@@ -128,17 +127,17 @@ module Arxutils_Sqlite3
       end
     end
 
-    # relationを表すクラス定義のファイルの内容を生成
+    # acrecordを表すクラス定義のファイルの内容を生成
     def make_content_array
-      # スキーマ設定配列から、relationのmigrate用のスクリプトの内容(ハッシュ形式)の配列を作成する
-      relations = @db_scheme_ary.map do |x|
-        make_relation(x, "count")
+      # スキーマ設定配列から、acrecordのmigrate用のスクリプトの内容(ハッシュ形式)の配列を作成する
+      acrecords = @db_scheme_ary.map do |x|
+        make_acrecord(x, "count")
       end
-      relations.select { |x| x.size.positive? }
+      acrecords.select { |x| x.size.positive? }
     end
 
-    # Countクラス用のrelationのスクリプトの内容に変換
-    def convert_count_class_relation(data, src_fname)
+    # Countクラス用のacrecordのスクリプトの内容に変換
+    def convert_count_class_acrecord(data, src_fname)
       convert(data, @src_path, src_fname)
     end
 
@@ -158,23 +157,23 @@ module Arxutils_Sqlite3
       end
     end
 
-    # 英子文字で表現したクラス名が、countを表していなければ、relationを
+    # 英子文字で表現したクラス名が、countを表していなければ、acrecordを
     # 英子文字で表現したクラス名が、countを表していれが、空のハッシュを返す
-    # スキーマでbase, noitem以外のフィールドが指定されていれば、そのフィールドに対するrelationの設定の内容を返す
-    def make_relation(data, count_classname_downcase)
+    # スキーマでbase, noitem以外のフィールドが指定されていれば、そのフィールドに対するacrecordの設定の内容を返す
+    def make_acrecord(data, count_classname_downcase)
       if data[:classname_downcase] == count_classname_downcase
         {}
       else
-        # 指定フィールドのフィールド名に対応したテンプレートファイルを用いて、relation設定を作成
+        # 指定フィールドのフィールド名に対応したテンプレートファイルを用いて、acrecord設定を作成
         data[:flist].each_with_object({ content: [], need_count_class: nil }) do |field_name, s|
           case field_name
           when "base", "noitem"
-            name_base = "relation"
-            # data[:relation]がnilに設定されていたら改めて空の配列を設定
-            data[:relation] = [] unless data[:relation]
+            name_base = "acrecord"
+            # data[:acrecord]がnilに設定されていたら改めて空の配列を設定
+            data[:acrecord] = [] unless data[:acrecord]
           else
             data[:count_classname_downcase] = count_classname_downcase
-            name_base = "relation_#{field_name}"
+            name_base = "acrecord_#{field_name}"
             s[:need_count_class_plural] ||= data[:plural]
           end
           # テンプレートファイルからスクリプトの内容を作成
@@ -209,18 +208,18 @@ module Arxutils_Sqlite3
       end
     end
 
-    # relationのスクリプトをファイル出力する
-    def output_relation_script(content_array, relation_config)
-      dir = relation_config[:dir]
-      fname = relation_config[:filename]
+    # acrecordのスクリプトをファイル出力する
+    def output_acrecord_script(content_array, acrecord_config)
+      dir = acrecord_config[:dir]
+      fname = acrecord_config[:filename]
       fpath = File.join(dir, fname)
       File.open(fpath, "w") do |file|
-        relation_config[:module].map { |mod| file.puts("module #{mod}") }
+        acrecord_config[:module].map { |mod| file.puts("module #{mod}") }
         content_array.map do |x|
           file.puts x
           file.puts ""
         end
-        relation_config[:module].map { |_mod| file.puts("end") }
+        acrecord_config[:module].map { |_mod| file.puts("end") }
       end
     end
   end

data/lib/arxutils_sqlite3/version.rb

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

data/lib/arxutils_sqlite3.rb

@@ -16,11 +16,12 @@ end
 
 require_relative "arxutils_sqlite3/dbutil"
 require_relative "arxutils_sqlite3/config"
+require_relative "arxutils_sqlite3/cli"
 
 require_relative "arxutils_sqlite3/version"
 require_relative "arxutils_sqlite3/arx"
 require_relative "arxutils_sqlite3/transactstate"
 require_relative "arxutils_sqlite3/hier"
 require_relative "arxutils_sqlite3/migrate"
-require_relative "arxutils_sqlite3/migrate"
 require_relative "arxutils_sqlite3/util"
+require_relative "dbacrecord"

data/lib/dbacrecord.rb

@@ -0,0 +1,26 @@
+module Enop
+module Dbutil
+  class Count < ActiveRecord::Base
+    has_many :invalidennblists
+  end
+
+  class Countdatetime < ActiveRecord::Base
+  end
+
+  class Evnb < ActiveRecord::Base
+  end
+
+  class Ennblist < ActiveRecord::Base
+  end
+
+  class Invalidennblist < ActiveRecord::Base
+    belongs_to :ennblist , foreign_key: 'org_id'
+    belongs_to :count , foreign_key: ''
+  end
+
+  class Currentennblist < ActiveRecord::Base
+    belongs_to :ennblist , foreign_key: 'org_id'
+  end
+
+end
+end

data/lib/template/{relation/relation.tmpl → acrecord/acrecord.tmpl}

@@ -1,3 +1,3 @@
   class <%= @data[:classname] %> < ActiveRecord::Base
-<% @data[:relation].each do |x| %>    <%= x %>
+<% @data[:acrecord].each do |x| %>    <%= x %>
 <% end %>  end

data/lib/template/acrecord/db_scheme/db_scheme.yml.sample

@@ -0,0 +1,48 @@
+---
+- :flist:
+    - noitem
+  :classname: Countdatetime
+  :classname_downcase: countdatetime
+  :items:
+    - - countdatetime
+      - datetime
+      - 'false'
+  :plural: countdatetimes
+  :ar_version: 6.0
+- :flist:
+    - noitem
+  :classname: Evnb
+  :classname_downcase: evnb
+  :items:
+    - - time_id
+      - integer
+      - 'false'
+    - - ennb_id
+      - integer
+      - 'false'
+  :plural: evnbs
+  :ar_version: 6.0
+- :flist:
+    - noitem
+    - invalid
+    - current
+  :classname: Ennblist
+  :classname_downcase: ennblist
+  :items:
+    - - stack
+      - string
+      - 'false'
+    - - notebook
+      - string
+      - 'false'
+    - - count
+      - integer
+      - 'false'
+    - - tag_count
+      - integer
+      - 'false'
+    - - start_datetime
+      - datetime
+      - 'false'
+  :plural: ennblists
+  :ar_version: 6.0

data/lib/template/acrecord/db_scheme/opts.rb

@@ -0,0 +1,7 @@
+@opts = {
+  acrecord: {
+    module: %w[<%= klass %> Dbutil],
+    filename: "dbacrecord.rb",
+    dir: "lib"
+  }
+}

data/lib/template/acrecord/db_scheme/opts.rb.sample

@@ -0,0 +1,7 @@
+@opts = {
+  acrecord: {
+    module: %w[Enop Dbutil],
+    filename: "dbacrecord.rb",
+    dir: "lib"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.49
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - exe/arxutils_sqlite3
 - lib/arxutils_sqlite3.rb
 - lib/arxutils_sqlite3/arx.rb
+- lib/arxutils_sqlite3/cli.rb
 - lib/arxutils_sqlite3/config.rb
 - lib/arxutils_sqlite3/dbutil.rb
 - lib/arxutils_sqlite3/dbutil/dbconnect.rb
@@ -225,19 +226,22 @@ files:
 - lib/arxutils_sqlite3/transactstate.rb
 - lib/arxutils_sqlite3/util.rb
 - lib/arxutils_sqlite3/version.rb
+- lib/dbacrecord.rb
+- lib/template/acrecord/acrecord.tmpl
+- lib/template/acrecord/acrecord_count.tmpl
+- lib/template/acrecord/acrecord_current.tmpl
+- lib/template/acrecord/acrecord_invalid.tmpl
+- lib/template/acrecord/base.tmpl
+- lib/template/acrecord/current.tmpl
+- lib/template/acrecord/db_scheme/db_scheme.yml
+- lib/template/acrecord/db_scheme/db_scheme.yml.sample
+- lib/template/acrecord/db_scheme/dbsetup.rb
+- lib/template/acrecord/db_scheme/opts.rb
+- lib/template/acrecord/db_scheme/opts.rb.sample
+- lib/template/acrecord/invalid.tmpl
+- lib/template/acrecord/noitem.tmpl
 - lib/template/config/mysql.tmpl
 - lib/template/config/sqlite3.tmpl
-- lib/template/relation/base.tmpl
-- lib/template/relation/current.tmpl
-- lib/template/relation/db_scheme/db_scheme.yml
-- lib/template/relation/db_scheme/dbsetup.rb
-- lib/template/relation/db_scheme/opts.rb
-- lib/template/relation/invalid.tmpl
-- lib/template/relation/noitem.tmpl
-- lib/template/relation/relation.tmpl
-- lib/template/relation/relation_count.tmpl
-- lib/template/relation/relation_current.tmpl
-- lib/template/relation/relation_invalid.tmpl
 homepage: https://ykominami.github.io/arxutils_sqlite3/
 licenses:
 - MIT

data/lib/template/relation/db_scheme/opts.rb

@@ -1,8 +0,0 @@
-@opts = {
-  db_dir: Arxutils_Sqlite3::Config::DB_DIR,
-  relation: {
-    module: %w[<%= klass %> Dbutil],
-    filename: "dbrelation.rb",
-    dir: "lib"
-  }
-}