activerecord_bulkoperation 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12fc174b11b0a39fa81778b9c0d0b66d7f698956777c747390aa14873521d91c
-  data.tar.gz: 89dd91a3338c3057fb91ba2d54e2ffe95a60b8d2764bd90427ce79e9e63c50c8
+  metadata.gz: 8cd1a3f72c3b4baf9436779bc459ab59bcb3f7c7911b2f0e841aec228a32f66e
+  data.tar.gz: 7bd30bb4fdcb5ad7bc288a9fc157296fa719c521386677c6d1828a200bfa96db
 SHA512:
-  metadata.gz: f8db1e56b50b1e5e1a58f779bbfe93df7c2f7d9055a08c29b6bee5a13a193476b36813d023d0e8155a8d3a3aa1feb8065e7dd7e3e34d6884ec8b84a7fc7a500f
-  data.tar.gz: f4450aaf3303b8fc9b4ba7f0c5704b9fef2fd1e170d574bec83b5c52f7be3057c53ec628c7cc749a827a96a6bd403f9723fb3778a2034ec975660b15bdbc46bf
+  metadata.gz: ccc9feeb4fe97d6b1ac4565caea284a30df03915c7a21952b9302a3369b317a34e32f359162f9416a52bf59ea1f42cd5fb6878be722f2530f330eb44ba52b583
+  data.tar.gz: 056b5188abd6b43920aaf54052d6e405ff6536d8e2f54f1baf8c03932d3f50b8806f4a6c8e2023c23db5ff7aa69bae64faf8569cc2ac6879a9d00566b6dbf5c7

data/activerecord_bulkoperation.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">=2.3"
 
-  gem.add_runtime_dependency "activerecord", ">=4.2", "<6"
+  gem.add_runtime_dependency "activerecord", ">=4.2"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "minitest"

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/active_record/associations/associations.rb

@@ -1,17 +1,26 @@
 require 'active_record/associations'
 
 module ActiveRecord
-
   module Persistence
     module ClassMethods
+      
+      alias_method :instantiate_without_save_original, :instantiate
+
+      def instantiate(attributes, column_types = {})
+        record = instantiate_without_save_original(attributes, column_types)
+        record.save_original
+        record
+      end
 
-        alias_method :instantiate_without_save_original, :instantiate
+      if ActiveRecord.gem_version >= Gem::Version.new('6.0')
+        alias_method :instantiate_instant_of_without_save_original, :instantiate_instance_of
 
-        def instantiate(attributes, column_types = {})
-          record = instantiate_without_save_original(attributes, column_types)
+        def instantiate_instance_of(klass, attributes, column_types = {}, &block)
+          record = instantiate_instant_of_without_save_original(klass, attributes, column_types)
           record.save_original
-          record
+          record 
         end
+      end
     end
   end
 
@@ -155,16 +164,18 @@ module ActiveRecord
 
       class JoinBase 
         attr_accessor :cached_record
-        def extract_record(row,column_names_with_alias)
-          # if the :select option is set, only the selected field should be extracted
-          # column_names_with_alias.inject({}){|record, (cn, an)| record[cn] = row[an] if row.has_key?(an); record}
-          record = {}
-          column_names_with_alias.each { |(cn, an)| record[cn] = row[an] if row.key?(an) }
-          record
-        end
-        alias_method :instantiate_without_save_original, :instantiate        
-        def instantiate(row, aliases)          
-          instantiate_without_save_original(row, aliases)
+        if ActiveRecord.gem_version < Gem::Version.new('6.0')
+          def extract_record(row,column_names_with_alias)
+            # if the :select option is set, only the selected field should be extracted
+            # column_names_with_alias.inject({}){|record, (cn, an)| record[cn] = row[an] if row.has_key?(an); record}
+            record = {}
+            column_names_with_alias.each { |(cn, an)| record[cn] = row[an] if row.key?(an) }
+            record
+          end
+          alias_method :instantiate_without_save_original, :instantiate        
+          def instantiate(row, aliases)          
+            instantiate_without_save_original(row, aliases)
+          end
         end
       end
     end

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.1.0'
+    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.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - OSP
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,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
@@ -134,7 +129,7 @@ homepage: ''
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: ''
 test_files: