activerecord_bulkoperation 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd7b2c2456f8bf5d1522669b3169a97609ede57
-  data.tar.gz: 650d94dc039ec2a30509d64f59e98c44cafd0830
+  metadata.gz: 17592890c6cddecfc0574cfbc0b2646ddc753cc9
+  data.tar.gz: 6796ddbfd955454f12bc5404e44210f497967263
 SHA512:
-  metadata.gz: b7a552c53ab19e865cd000b3182c86b628f73e391e2c512202aaea2d861309ecdcb07576728c78202a757739ace52e15a8f3ae18f91af66d7fbbf99a4133b557
-  data.tar.gz: b49271ed11969fb47cb60c614df7d7fa5fde3b93e5313b356a4f337ff891e35e11720d51575bd51fcf95bfdda6478f54c2e5b92002e21a9a42adfef8bce79744
+  metadata.gz: 1aa53b84368fe12513710f1ab441fb75c47d5457960a827e7f7dac6082162502c798bca0f70d2bdf8e2d2b7b9f856b08ce661c52edcd0dd13306fab4f0ef7eb2
+  data.tar.gz: d1b4f8b3f2249ada5035e6dc7e2f8f84837619789a67aa42a3f4d8efcfa0fb4f746bdc3725d444594ea3a92e9f12fa0d44b9089fcdefd9493ff449ad83a85c9a

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

@@ -1,3 +1,5 @@
+require_relative '../../monkey_patch/bindtype'
+
 module ActiveRecord
   module Bulkoperation
     module BatchUpdate
@@ -172,7 +174,7 @@ module ActiveRecord
 
         def bind_column(cursor, index, type, column)
           if type == :string
-            cursor.bind_param_array(":#{index}", column, String, get_max_string_length(column))
+            cursor.bind_param_array(":#{index}", column, String)
 
           elsif type == :integer
             cursor.bind_param_array(":#{index}", column, Fixnum)
@@ -189,19 +191,6 @@ module ActiveRecord
           end
         end
 
-        def get_max_string_length(column)
-          return nil if column.nil?
-
-          max_length = 0
-
-          column.each do |value|
-            next if value.nil?
-            max_length = value.length if value.length > max_length
-          end
-
-          return max_length > 0 ? max_length : nil
-        end
-
         def get_date_type(value)
           return Date if value.nil?
 

data/lib/activerecord_bulkoperation/monkey_patch/bindtype.rb

@@ -0,0 +1,92 @@
+require 'oci8'
+
+#--
+# bindtype.rb -- OCI8::BindType
+#
+# Copyright (C) 2009-2011 KUBO Takehiro <kubo@jiubao.org>
+#++
+
+#
+class OCI8
+  module BindType
+
+    class String
+      # 1333 <= ceil(4000 / 3). 4000 is max size of char. 3 is NLS ratio of UTF-8.
+      @@minimum_bind_length = 1333
+
+      def self.minimum_bind_length
+        @@minimum_bind_length
+      end
+
+      def self.minimum_bind_length=(val)
+        @@minimum_bind_length = val
+      end
+
+      def self.create(con, val, param, max_array_size)
+        case param
+        when Hash
+          param[:length_semantics] = OCI8::properties[:length_semantics] unless param.has_key? :length_semantics
+          unless param[:length]
+            if val.is_a?(Array) && val.any?
+              max = 0
+              val.each do |elem|
+                length = self.get_length(elem, param)
+                max = length if max < length
+              end
+              param[:length] = max
+            else
+              param[:length] = self.get_length(val, param)
+            end
+          end
+          # use the default value when :nchar is not set explicitly.
+          param[:nchar] = OCI8.properties[:bind_string_as_nchar] unless param.has_key?(:nchar)
+        when OCI8::Metadata::Base
+          case param.data_type
+          when :char, :varchar2
+            length_semantics = OCI8.properties[:length_semantics]
+            if length_semantics == :char
+              length = param.char_size
+            else
+              length = param.data_size * OCI8.nls_ratio
+            end
+            param = {
+              :length => length,
+              :length_semantics => length_semantics,
+              :nchar => (param.charset_form == :nchar),
+            }
+          when :raw
+            # HEX needs twice space.
+            param = {:length => param.data_size * 2}
+          else
+            param = {:length => @@minimum_bind_length}
+          end
+        end
+        self.new(con, val, param, max_array_size)
+      end
+
+      private
+
+      def self.get_length(val, param)
+        if val.respond_to? :to_str
+          val = val.to_str
+          if param[:length_semantics] == :char
+            # character semantics
+            return val.size
+          else
+            # byte semantics
+            if OCI8.encoding != val.encoding
+              # If the string encoding is different with NLS_LANG character set,
+              # convert it to get the length.
+              val = val.encode(OCI8.encoding)
+            end
+            return val.bytesize
+          end
+        else
+          return @@minimum_bind_length
+        end
+      end
+    end
+
+  end
+
+end

data/lib/activerecord_bulkoperation/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bulkoperation
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_bulkoperation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - OSP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,6 +64,7 @@ files:
 - lib/activerecord_bulkoperation/connection_adapters/oracle_enhanced/oci_connection.rb
 - lib/activerecord_bulkoperation/group_operations.rb
 - lib/activerecord_bulkoperation/group_operations_select.rb
+- lib/activerecord_bulkoperation/monkey_patch/bindtype.rb
 - lib/activerecord_bulkoperation/util/connection_object.rb
 - lib/activerecord_bulkoperation/util/entity_hash.rb
 - lib/activerecord_bulkoperation/util/flush_dirty_objects.rb