arxutils_sqlite3 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09dc03b438aa54a9f0bb3e49c46b7592593e52a4e4275220a1b66890694054e
-  data.tar.gz: 1afd929a60c9e1fed27e11b9ff4ea87761be5dd77e15cf87cb2e090a153dbc07
+  metadata.gz: 68d6c8715c3a6aa14cd2d32e85d6757831555b23b5b1241417b01bf6d2527e91
+  data.tar.gz: 97612549672e709093582b1ccc1145cf4f5390c8fb9c17101f7c3e8e4e060db2
 SHA512:
-  metadata.gz: 3f63fa45e2827cc7c16ae8fc534c2ef725e1359c4d2c9f99c4edc73af78b846eaf43319c25cb177636cffef8d997fc939e6d97e865ece6ea0a0a064d398d90df
-  data.tar.gz: 508aa3ff67bddd7e1ec59403e6f18d024f71e79dbd23aa750dd6c736bd3a3183091f7ec9fde7b61d634091dddf41ef5885f5d6b900fcb8c4eb5a97bdde077ed7
+  metadata.gz: 2b0adfce62098bfe191391da978f3a3e7387201bc3161a46359165f694744a70730ff8b92b4b9ee8748ee46b7ecabc2b81e88718b15fae29ed0ed0db7638a745
+  data.tar.gz: 22b7ffc62b39e1b7b227f8298ee1d1da3ed72cbc52358364657a27578cbfd50cc6f0bdbd8393931405f4574d7d1667c15ca79f24ab6fccf522531f335f504361

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

@@ -8,6 +8,8 @@ require "ykxutils"
 
 config = Arxutils_Sqlite3::Config.new
 
+cli = Arxutils_Sqlite3::Cli.new(config)
+
 config.require_opts_file
 
 begin
@@ -34,6 +36,7 @@ Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Arxutils_Sqlite3::VERSI
   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"]
 
 env = ENV.fetch("ENV", nil)
 env ||= "production"
@@ -46,21 +49,12 @@ when "s"
     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 "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)
+  relation = opts["relation"]
+  cli.makeconfig(dbconfig, relation, banner, 30, opts)
 
 when "m"
   yaml_fname = opts["yaml"]
@@ -72,57 +66,24 @@ when "m"
   end
   yaml_pn = Pathname.new(yaml_fname)
   config.check_file_not_exist(yaml_pn, banner, 55)
-  db_scheme_ary = YAML.load_file( yaml_pn )
-
-  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
+  cli.migrate(yaml_pn, relation, klass, dbconfig, env)
 
 when "i"
   dbconfig = opts["dbconfig"]
-  connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(config, dbconfig, env)
-  Dbsetup.new(connect_time)
+  cli.integrate(dbconfig, env)
 
 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
-
-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
+  relation = opts["relation"]
+  cli.delete(dbconfig, db_scheme_ary, relation)
 
 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
-
+  relation = opts["relation"]
+  cli.delete_db(dbconfig, db_scheme_ary, relation)
 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

data/lib/arxutils_sqlite3/cli.rb

@@ -0,0 +1,67 @@
+module Arxutils_Sqlite3
+  # CLI用クラス
+  class Cli
+    def initialize(config)
+      @config = config
+    end
+
+    def setup(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
+    end
+
+    def makeconfig(dbconfig, relation, 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, relation)
+      mig.make_dbconfig(opts)
+    end
+
+    def migrate(yaml_pn, relation, klass, dbconfig, env)
+      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, 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
+    end
+
+    def integrate(dbconfig, env)
+      connect_time = Arxutils_Sqlite3::Dbutil::Dbconnect.db_connect(@config, dbconfig, env)
+      Dbsetup.new(connect_time)
+    end
+
+    def delete(dbconfig, db_scheme_ary, relation)
+      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, relation)
+      mig.delete_migrate_and_config_and_db
+    end
+
+    def delete_db(dbconfig, db_scheme_ary, relation)
+      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, relation)
+      # mig.delete_migrate_config_and_db
+      mig.delete_db
+    end
+
+    def rm_dbconfig(dbconfig)
+      dbconfig_path = @config.make_dbconfig_path(dbconfig)
+      p dbconfig_path
+      FileUtils.rm_f(dbconfig_path)
+    end
+  end
+end

data/lib/arxutils_sqlite3/dbutil/dbrelation.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/arxutils_sqlite3/version.rb

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

data/lib/arxutils_sqlite3.rb

@@ -16,6 +16,7 @@ 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - yasuo kominami
@@ -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,9 +217,11 @@ 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
+- lib/arxutils_sqlite3/dbutil/dbrelation.rb
 - lib/arxutils_sqlite3/hier.rb
 - lib/arxutils_sqlite3/migrate.rb
 - lib/arxutils_sqlite3/transactstate.rb