activerecord_bulkoperation 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2735a535f8978583510c6079c0cc148f1b9a54fe00e56069700b14a1e610cbd6
-  data.tar.gz: 438a9abd06927a197a81f8989fc71918d50d165e0d4a4e30a8257007a649468d
+  metadata.gz: 8cd1a3f72c3b4baf9436779bc459ab59bcb3f7c7911b2f0e841aec228a32f66e
+  data.tar.gz: 7bd30bb4fdcb5ad7bc288a9fc157296fa719c521386677c6d1828a200bfa96db
 SHA512:
-  metadata.gz: 101d242de66ba767fbe498e475c404303a71430546cd4ebf1330398afe5e45a4ac9429ca57526b535dcad51632b89f16472bbb6ba1e4f415a6640cbda314b012
-  data.tar.gz: d3f1816e0cdf4854cfa665a72320b2e388bf0b73902228e3160db688eddac9e1bd4ce0b33066ffdab0a1334c71392cee1a2df5603a81a3bb681b4030bf6dcdfb
+  metadata.gz: ccc9feeb4fe97d6b1ac4565caea284a30df03915c7a21952b9302a3369b317a34e32f359162f9416a52bf59ea1f42cd5fb6878be722f2530f330eb44ba52b583
+  data.tar.gz: 056b5188abd6b43920aaf54052d6e405ff6536d8e2f54f1baf8c03932d3f50b8806f4a6c8e2023c23db5ff7aa69bae64faf8569cc2ac6879a9d00566b6dbf5c7

data/gemfiles/6.0.gemfile

@@ -4,4 +4,4 @@ platforms :ruby do
   gem 'ruby-oci8', '~> 2.2'
 end
 
-gem 'activerecord', '~> 6.0'
+gem 'activerecord', '~> 6.0.4'

data/gemfiles/6.1.gemfile

@@ -0,0 +1,7 @@
+gem 'activerecord-oracle_enhanced-adapter', '~> 6.0'
+
+platforms :ruby do
+  gem 'ruby-oci8', '~> 2.2'
+end
+
+gem 'activerecord', '~> 6.1.4'

data/lib/activerecord_bulkoperation/base.rb

@@ -24,7 +24,9 @@ module ActiveRecord
 
     # Loads the import functionality for the passed in ActiveRecord connection
     def self.load_from_connection_pool(connection_pool)
-      require_adapter connection_pool.spec.config[:adapter]
+      # currently only oracle_enhanced_adapter is supported and connection_pool.spec does not work with Rails 6.1.
+      # require_adapter connection_pool.spec.config[:adapter]
+      require_adapter('oracle_enhanced')
     end
   end
 end

data/lib/activerecord_bulkoperation/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bulkoperation
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/test/database.yml

@@ -1,4 +1,4 @@
-oracle_enhanced:
+test:
   adapter: oracle_enhanced
   # url: jdbc:oracle:thin:@localhost:1521:XEPDB1
   username: <%=ENV['DB_USER'] ||= "sample" %>

data/test/test_helper.rb

@@ -25,7 +25,12 @@ adapter = ENV["DB_ADAPTER"] || "oracle_enhanced"
 FileUtils.mkdir_p 'log'
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG
-ActiveRecord::Base.configurations['test'] = YAML.load(ERB.new(File.read(test_dir.join("database.yml"))).result)[adapter]
+
+if ActiveRecord.gem_version >= Gem::Version.new('6.1')
+    ActiveRecord::Base.configurations = ActiveRecord::DatabaseConfigurations.new(YAML.load(ERB.new(File.read(test_dir.join("database.yml"))).result))
+else
+    ActiveRecord::Base.configurations['test'] = YAML.load(ERB.new(File.read(test_dir.join("database.yml"))).result)['test']
+end
 ActiveRecord::Base.default_timezone = :utc
 
 require "activerecord_bulkoperation"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_bulkoperation
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - OSP
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,6 +83,7 @@ files:
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/activerecord_bulkoperation.rb
 - lib/activerecord_bulkoperation/active_record/adapters/abstract_adapter.rb
 - lib/activerecord_bulkoperation/active_record/adapters/oracle_enhanced_adapter.rb
@@ -128,7 +129,7 @@ homepage: ''
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: ''
 test_files: