standalone_activerecord_boot_loader 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8f08d56bc81a54009dceeb08cb557f028b0fb2d2114429d49e531bae30f7da
-  data.tar.gz: 2c5227c63b26e9d7fc743ad6049bbe1499ec78c1d1321c1347d1e04b1d70cee6
+  metadata.gz: df4b2b206babe944bedc4374b282b192850edd3488be8a8e3f4c1474a240a1a3
+  data.tar.gz: 5575bf0d8a514583e552ae143714f93a384891ac7880e255d7a88341d0f8e32d
 SHA512:
-  metadata.gz: c5d433dea59d6197dd8ddd9f91e1d4012ed5d6221c1a3a499354d19132eeee94eb516b671f92935f13d168e13089096cfae400714aa0e0de07ac316647c29aa9
-  data.tar.gz: c44157dfffbe29e425fda0020ab9e0f642e830318bf5922870480c5d343beeada8a24b9f4109e940a2765b50f23424af6622d081b1372614df50ee9dc10ec9a1
+  metadata.gz: 720b7e1078459443e7bf8b68086ba6a56a818d84e07c99390560e27693857fb53fdb2527b8889668ff3d426603fd2102f5371651d5567504462df243da3bcca4
+  data.tar.gz: 6129f0fa6078c85c3dbf92e4db0e4f8bcb03fb6bfb32650f91d60cdf08bec89dfc7bd411706b31fad69877f0c821d0a98a7ce74a989da1bc8367c517b7a29b43

data/lib/standalone_activerecord_boot_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StandaloneActiverecordBootLoader
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/standalone_activerecord_boot_loader.rb

@@ -38,17 +38,10 @@ module StandaloneActiverecordBootLoader
     end
 
     def create_database
-      conn_spec = database_config[@env]
-
-      # ActiveRecord 6系以降
-      if defined?(ActiveRecord::DatabaseConfigurations::HashConfig)
-        conn_spec = ActiveRecord::DatabaseConfigurations::HashConfig.new(@env, 'primary', conn_spec)
-      end
-
-      tasks = ActiveRecord::Tasks::MySQLDatabaseTasks.new(conn_spec)
+      tasks = ActiveRecord::Tasks::MySQLDatabaseTasks.new(build_database_config)
       begin
         tasks.create
-      rescue => e
+      rescue StandardError => e
         # ActiveRecord 5系
         if defined?(ActiveRecord::Tasks::DatabaseAlreadyExists)
           return if e.instance_of?(ActiveRecord::Tasks::DatabaseAlreadyExists)
@@ -70,5 +63,16 @@ module StandaloneActiverecordBootLoader
     def database_config
       @database_config ||= YAML::load(ERB.new(File.read(database_yml_path)).result)
     end
+
+    def build_database_config
+      unless defined?(ActiveRecord::DatabaseConfigurations::HashConfig)
+        return database_config[@env]
+      end
+
+      config = ActiveRecord::DatabaseConfigurations::HashConfig.new(@env, 'primary', database_config[@env])
+      return database_config[@env] unless config.respond_to?(:merge)
+
+      config
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standalone_activerecord_boot_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takahiro Ooishi
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -60,7 +60,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/taka0125/standalone_activerecord_boot_loader
   source_code_uri: https://github.com/taka0125/standalone_activerecord_boot_loader
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -75,8 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: ActiveRecordを単体で動かす時に使う起動処理
 test_files: []