ruby-oci8 2.1.7 → 2.1.8

data/lib/oci8/cursor.rb

@@ -55,7 +55,7 @@ class OCI8
     # example:
     #   cursor = conn.parse("SELECT * FROM emp WHERE ename = :ename")
     #   cursor.bind_param(1, 'SMITH') # bind by position
-    #     ...or...
+    #   # ...or...
     #   cursor.bind_param(':ename', 'SMITH') # bind by name
     #
     # To bind as number, Fixnum and Float are available, but Bignum is

data/lib/oci8/oci8.rb

@@ -384,6 +384,77 @@ class OCI8
   def self.client_charset_name
     @@client_charset_name
   end
+
+  if OCI8.oracle_client_version >= OCI8::ORAVER_11_1
+    # Returns send timeout in seconds.
+    # Zero means no timeout.
+    # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF228 SQLNET.SEND_TIMEOUT} in client-side sqlnet.ora.
+    #
+    # @return [Float] seconds
+    # @see #recv_timeout
+    # @since 2.1.8 and Oracle 11.1
+    def send_timeout
+      # OCI_ATTR_SEND_TIMEOUT = 435
+      @server_handle.send(:attr_get_ub4, 435).to_f / 1000
+    end
+
+    # Sets send timeout in seconds.
+    # Zero means no timeout.
+    # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF228 SQLNET.SEND_TIMEOUT} in client-side sqlnet.ora.
+    #
+    # If you have trouble by setting this, don't use it because it uses
+    # {http://blog.jiubao.org/2015/01/undocumented-oci-handle-attributes.html an undocumented OCI handle attribute}.
+    #
+    # @param [Float] timeout
+    # @return [void]
+    # @see #recv_timeout=
+    # @since 2.1.8 and Oracle 11.1
+    def send_timeout=(timeout)
+      # OCI_ATTR_SEND_TIMEOUT = 435
+      @server_handle.send(:attr_set_ub4, 435, timeout * 1000)
+    end
+
+    # Returns receive timeout in seconds.
+    # Zero means no timeout.
+    # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF227 SQLNET.RECV_TIMEOUT} in client-side sqlnet.ora.
+    #
+    # @return [Float] seconds
+    # @see #send_timeout
+    # @since 2.1.8 and Oracle 11.1
+    def recv_timeout
+      # OCI_ATTR_RECEIVE_TIMEOUT = 436
+      @server_handle.send(:attr_get_ub4, 436).to_f / 1000
+    end
+
+    # Sets receive timeout in seconds.
+    # Zero means no timeout.
+    # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF227 SQLNET.RECV_TIMEOUT} in client-side sqlnet.ora.
+    #
+    # If you have trouble by setting this, don't use it because it uses
+    # {http://blog.jiubao.org/2015/01/undocumented-oci-handle-attributes.html an undocumented OCI handle attribute}.
+    #
+    # @param [Float] timeout
+    # @return [void]
+    # @see #send_timeout=
+    # @since 2.1.8 and Oracle 11.1
+    def recv_timeout=(timeout)
+      # OCI_ATTR_RECEIVE_TIMEOUT = 436
+      @server_handle.send(:attr_set_ub4, 436, timeout * 1000)
+    end
+  else
+    def send_timeout
+      raise NotImplementedError, 'send_timeout is unimplemented in this Oracle version'
+    end
+    def send_timeout=(timeout)
+      raise NotImplementedError, 'send_timeout= is unimplemented in this Oracle version'
+    end
+    def recv_timeout
+      raise NotImplementedError, 'recv_timeout is unimplemented in this Oracle version'
+    end
+    def recv_timeout=(timeout)
+      raise NotImplementedError, 'revc_timeout= is unimplemented in this Oracle version'
+    end
+  end
 end
 
 class OCIError

data/lib/oci8/properties.rb

@@ -1,6 +1,6 @@
 # properties.rb -- implements OCI8.properties
 #
-# Copyright (C) 2010-2013 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2010-2015 Kubo Takehiro <kubo@jiubao.org>
 
 #
 class OCI8
@@ -11,7 +11,8 @@ class OCI8
     :bind_string_as_nchar => false,
     :float_conversion_type => OCI8.__get_prop(1) ? :ruby : :oracle,
     :statement_cache_size => 0,
-    :events_mode => ((OCI8.__get_prop(2) & 4) != 0) # 4 <- OCI_EVENTS in oci.h
+    :events_mode => ((OCI8.__get_prop(2) & 4) != 0), # 4 <- OCI_EVENTS in oci.h
+    :cancel_read_at_exit => false,
   }
 
   if OCI8.oracle_client_version < OCI8::ORAVER_9_2
@@ -56,6 +57,9 @@ class OCI8
       else
         OCI8.__set_prop(2, OCI8.__get_prop(2) & ~4) # unset OCI_EVENTS
       end
+    when :cancel_read_at_exit
+      val = val ? true : false
+      OCI8.__set_prop(3, val)
     end
     super(name, val)
   end
@@ -120,11 +124,22 @@ class OCI8
   #     
   #       require 'oci8'
   #       OCI8.properties[:events_mode] = true # works fine.
-  #       ... call some OCI methods ...
+  #       # ... call some OCI methods ...
   #       OCI8.properties[:events_mode] = true # raises a runtime error.
   #     
   #     *Since:* 2.1.4
   #
+  # [:cancel_read_at_exit]
+  #
+  #     +true+ when read system calls are canceled at exit. Otherwise, +false+.
+  #     The default value is +false+ because it uses unusual technique which
+  #     hooks read system calls issued by Oracle client library and it works
+  #     only on Linux, OSX and Windows.
+  #     This feature is added not to block ruby process termination when
+  #     network quality is poor and packets are lost irregularly.
+  #
+  #     *Since:* 2.1.8
+  #
   # @return [a customized Hash]
   # @since 2.0.5
   #

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 1
-  - 7
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors: 
 - Kubo Takehiro
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-02 00:00:00 +09:00
+date: 2015-04-04 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -60,6 +55,7 @@ files:
 - ext/oci8/env.c
 - ext/oci8/error.c
 - ext/oci8/extconf.rb
+- ext/oci8/hook_funcs.c
 - ext/oci8/lob.c
 - ext/oci8/metadata.c
 - ext/oci8/object.c
@@ -73,6 +69,10 @@ files:
 - ext/oci8/oradate.c
 - ext/oci8/oranumber_util.c
 - ext/oci8/oranumber_util.h
+- ext/oci8/plthook.h
+- ext/oci8/plthook_elf.c
+- ext/oci8/plthook_osx.c
+- ext/oci8/plthook_win32.c
 - ext/oci8/post-config.rb
 - ext/oci8/stmt.c
 - ext/oci8/thread_util.c
@@ -131,27 +131,21 @@ require_paths:
 - lib
 - ext/oci8
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 0
       version: 1.8.0
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API