activerecord_bulkoperation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2820ff19963204787d8de587378d314ff507bacac18496e04042f6d289109b89
-  data.tar.gz: 6dbb29d24697e3f1e08facc2dc91c243ab34bacbb1f59e1cb5a8e298bb6e5bf9
+  metadata.gz: 89ea73e438d44f7bd6d0b78b995057bc05254b19217d9fdf907c5938fee06e87
+  data.tar.gz: ca64781fe00476635ba2dc008c28557c6879d0512f01951077cdb1eafa2b8b27
 SHA512:
-  metadata.gz: 12b2ce79daba44f89ff3cd55a398a305bd37a6be9fb92701f4798f23a09ebc4a47c396fc3d55cada3ec4e7cbafcefb100270b8dcf4904f4e1d75a6aeae13848f
-  data.tar.gz: 8f5cf8c0dec25d8140f97e3c51bb1c9c0e2eabc3e953a6d6186876f5b36bc9581d250de65ac527e972b85f390edfeb99fb1e16656028a4642bb9d63ba6fec6da
+  metadata.gz: 36859893c2c10556528b14302dc876defe26d694dc0ca3de6bd93fc1f8a620088d9c65751f2daf7395a66659ad0d0d0cf65c747fbc1fd729f06e3a4930abdf37
+  data.tar.gz: 665db719f1d4bb3cbcbb2910297d2c7bc62fe60baa3e0150d98fda4fa8510e09471e6ed6febc94d94f6a897269b46ac1191a252a8e32eb35c0e5936e62f555ce

data/lib/activerecord_bulkoperation/active_record/associations/associations.rb

@@ -1,18 +1,18 @@
 require 'active_record/associations'
 
 module ActiveRecord
-
   module Persistence
     module ClassMethods
+      
+      alias_method :instantiate_without_save_original, :instantiate
 
-        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
+      def instantiate(attributes, column_types = {})
+        record = instantiate_without_save_original(attributes, column_types)
+        record.save_original
+        record
+      end
 
+      if Rails.gem_version >= Rails.gem_version('6.0')
         alias_method :instantiate_instant_of_without_save_original, :instantiate_instance_of
 
         def instantiate_instance_of(klass, attributes, column_types = {}, &block)
@@ -20,6 +20,7 @@ module ActiveRecord
           record.save_original
           record 
         end
+      end
     end
   end
 
@@ -163,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 Rails.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/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bulkoperation
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_bulkoperation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - OSP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord