activerecord_bulkoperation 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16b6f4dcc796822bf9f70be61cee8aef893a8d5b
-  data.tar.gz: 630df700c5c08a83135f2a09259fd72727f67ad0
+SHA256:
+  metadata.gz: 8e7fa80792d9dbf81a8bf8225784e00ba349ac447a4fa4fd3f8fa3f36526318a
+  data.tar.gz: 305ed3af749bbd57818e540a3c53e5a9f537096665d74102e54f9c85f765ea4b
 SHA512:
-  metadata.gz: bd8cfc6f348ad5ef658a7fd9c776c88d8601cd9ad1833e50b82058ccbb41b68759f866dd1c14905714b3dbecebeacbccd0c1da354afcfbbbb0a6b39478a7a68d
-  data.tar.gz: f99d1aba3e113a7100c502176322af7a8899060628024976c9fc9f1733cb72b38064a851dbe9a19d06bf03211394094161e417485bed5e826c53ddac368f713d
+  metadata.gz: a03cd834a7fb83f0ee6bcd14787fb9de4230f70e7479bc611bec79cf2c9b456e1dd0608ec4b4b286f98372823ab37a33fe269102781a0031fcd374e7289fb8d7
+  data.tar.gz: 6195763a68be42ef7ab69f241d10b47a0b8cc2714c0f2ec95cab0df0dcbcca2acf8de9660e50d4c31c0e19594520c8ab4de2545727bed8ce7f1eda4b91bf106e

data/lib/activerecord_bulkoperation/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -21,10 +21,44 @@ module ActiveRecord
           end
 
           oci_conn = connection.raw_connection if connected?
-          fail 'Unable to access the raw OCI connection.' unless oci_conn          
+          fail 'Unable to access the raw OCI connection.' unless oci_conn
           cursor = oci_conn.parse(sql)
           fail "Unable to obtain cursor for this statement:\n#{sql}." unless cursor
 
+          if check_date_homogeneously(types, values)
+            affected_rows = execute_batch_update_array(cursor, sql, types, values, optimistic)
+          else
+            affected_rows = execute_batch_update_single(cursor, sql, types, values, optimistic)
+          end
+
+          affected_rows
+        end
+
+        private
+
+        # checks if all date values in one column of a row are of the same date type (Date/DateTime)
+        def check_date_homogeneously(types, rows)
+          types.each_with_index do |type, i|
+            if type == :date
+              common_type = nil
+              rows.each do |row|
+                type = get_date_type(row[i])
+
+                if common_type.nil?
+                  common_type = type
+                elsif common_type != type
+                  return false
+                end
+
+              end
+            end
+          end
+          return true
+        end
+
+        # execute batch update by single statement execution.
+        # slower than array statement execution, only used when date values in a column have inhomogeneous date types
+        def execute_batch_update_single(cursor, sql, types, values, optimistic)
           affected_rows = 0
 
           begin
@@ -63,44 +97,105 @@ module ActiveRecord
           affected_rows
         end
 
-        private
+        # execute batch update by array statement execution.
+        # faster than single statement execution, can only be used when all date values
+        # in a column have homogeneous date types
+        def execute_batch_update_array(cursor, sql, types, values, optimistic)
+          affected_rows = 0
+
+          begin
+            values_columnwise = convert_rows_to_columns(values, types.size)
+
+            cursor.max_array_size = values.size
+
+            (0..types.size - 1).each do |i|
+              bind_column(cursor, i + 1, types[i], values_columnwise[i])
+            end
+
+            result = cursor.exec_array
+
+            fail ExternalDataChange.new(sql) if result != values.count and optimistic
+
+            affected_rows += result
+
+            connection.send(:log, sql, 'Update') {}
+          ensure
+            cursor.close
+          end
 
-        def get_value(value)          
-          if(value.respond_to? :value)            
+          affected_rows
+        end
+
+        def convert_rows_to_columns(values_rowise, count)
+          values_columnwise = []
+          (0..count-1).each do |i|
+            column = []
+            values_rowise.each do |row|
+              column << get_value(row[i])
+            end
+            values_columnwise << column
+          end
+          values_columnwise
+        end
+
+        def get_value(value)
+          if(value.respond_to? :value)
             value.value
-           else
+          else
             value
           end
         end
 
-        def bind(cursor, index, type, input_value)          
-          value = get_value(input_value)          
+        def bind(cursor, index, type, input_value)
+          value = get_value(input_value)
           if type == :string
             cursor.bind_param(":#{index}", value, String)
 
-          elsif type == :integer            
+          elsif type == :integer
             cursor.bind_param(":#{index}", value, Fixnum)
 
           elsif type == :float
             cursor.bind_param(":#{index}", value, Float)
 
           elsif type == :date
-            if value.nil?
-              cursor.bind_param(":#{index}", nil, Date)
-            else              
-              if  ( value.kind_of?(DateTime) or value.kind_of?(Time)) and value.hour == 0 and value.min == 0 and value.sec == 0
-                cursor.bind_param(":#{index}", value, Date)
-              else
-                cursor.bind_param(":#{index}", value, DateTime)
-              end
-            end
+            cursor.bind_param(":#{index}", value, get_date_type(value))
 
           else
 
             fail ArgumentError.new("unsupported type #{type}")
           end
         end
+
+        def bind_column(cursor, index, type, column)
+          if type == :string
+            cursor.bind_param_array(":#{index}", column, String)
+
+          elsif type == :integer
+            cursor.bind_param_array(":#{index}", column, Fixnum)
+
+          elsif type == :float
+            cursor.bind_param_array(":#{index}", column, Float)
+
+          elsif type == :date
+            cursor.bind_param_array(":#{index}", column, get_date_type(column[0]))
+
+          else
+
+            fail ArgumentError.new("unsupported type #{type}")
+          end
+        end
+
+        def get_date_type(value)
+          return Date if value.nil?
+
+          if ( value.kind_of?(DateTime) or value.kind_of?(Time)) and value.hour == 0 and value.min == 0 and value.sec == 0
+            return Date
+          else
+            return DateTime
+          end
+        end
+
       end
     end
-  end  
+  end
 end

data/lib/activerecord_bulkoperation/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bulkoperation
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_bulkoperation
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - OSP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ''