ruby-oci8 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

data/lib/oci8/oci8.rb

@@ -117,8 +117,9 @@ class OCI8
     else
       tcp_connect_timeout = OCI8::properties[:tcp_connect_timeout]
       connect_timeout = OCI8::properties[:connect_timeout]
-      if tcp_connect_timeout || connect_timeout
-        dbname = to_connect_descriptor(dbname, tcp_connect_timeout, connect_timeout)
+      tcp_keepalive = OCI8::properties[:tcp_keepalive]
+      if tcp_connect_timeout || connect_timeout || tcp_keepalive
+        dbname = to_connect_descriptor(dbname, tcp_connect_timeout, connect_timeout, tcp_keepalive)
       end
     end
     if stmt_cache_size
@@ -558,7 +559,7 @@ class OCI8
   # and add TRANSPORT_CONNECT_TIMEOUT or CONNECT_TIMEOUT.
   #
   # @private
-  def to_connect_descriptor(database, tcp_connect_timeout, connect_timeout)
+  def to_connect_descriptor(database, tcp_connect_timeout, connect_timeout, tcp_keepalive)
     if @@easy_connect_naming_regex =~ database && ($1 || $2 || $4 || $5 || $6 || $7)
       connect_data = []
       connect_data << "(SERVICE_NAME=#$5)"
@@ -573,6 +574,9 @@ class OCI8
       if connect_timeout
         desc << "(CONNECT_TIMEOUT=#{connect_timeout})"
       end
+      if tcp_keepalive
+        desc << "(ENABLE=BROKEN)"
+      end
       "(DESCRIPTION=#{desc.join})"
     else
       database

data/lib/oci8/properties.rb

@@ -17,6 +17,8 @@ class OCI8
     :connect_timeout => nil,
     :send_timeout => nil,
     :recv_timeout => nil,
+    :tcp_keepalive => false,
+    :tcp_keepalive_time => nil,
   }
 
   # @private
@@ -62,6 +64,14 @@ class OCI8
         val = val.to_i
         raise ArgumentError, "The property value for :#{name} must be nil or a positive integer." if val <= 0
       end
+    when :tcp_keepalive
+      val = val ? true : false
+    when :tcp_keepalive_time
+      if !val.nil?
+        val = val.to_i
+        raise ArgumentError, "The property value for :#{name} must be nil or a positive integer." if val <= 0
+      end
+      OCI8.__set_prop(4, val)
     end
     super(name, val)
   end
@@ -165,6 +175,18 @@ class OCI8
   #
   #     *Since:* 2.2.2
   #
+  # [:tcp_keepalive]
+  #
+  #     See {file:docs/hanging-after-inactivity.md.md}
+  #
+  #     *Since:* 2.2.4
+  #
+  # [:tcp_keepalive_time]
+  #
+  #     See {file:docs/hanging-after-inactivity.md.md}
+  #
+  #     *Since:* 2.2.4
+  #
   # @return [a customized Hash]
   # @since 2.0.5
   #

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/ruby-oci8.gemspec

@@ -64,11 +64,7 @@ EOS
       raise "No compiled binary are found. Run make in advance."
     when 1
       puts "Binary gem for ruby #{so_vers.first}"
-      if so_vers[0] < '2.0.0'
-        s.required_ruby_version = "~> #{so_vermin}"
-      else
-        s.required_ruby_version = "~> #{so_vermin}.0"
-      end
+      s.required_ruby_version = "~> #{so_vermin}"
     else
       puts "Binary gem for ruby #{so_vers.join(', ')}"
       s.required_ruby_version = ">= #{so_vermin}"

data/test/test_all.rb

@@ -9,6 +9,7 @@ require "#{srcdir}/test_bind_array.rb"
 require "#{srcdir}/test_bind_string"
 require "#{srcdir}/test_bind_time"
 require "#{srcdir}/test_bind_raw"
+require "#{srcdir}/test_bind_integer"
 if $test_clob
   require "#{srcdir}/test_clob"
 end

data/test/test_bind_integer.rb

@@ -0,0 +1,47 @@
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestBindInteger < Minitest::Test
+
+  def setup
+    @conn = get_oci8_connection
+  end
+
+  POSITIVE_INTS = [
+    100,
+    2**30,
+    2**31,
+    2**32,
+    2**33,
+    2**62,
+    2**63,
+    2**64,
+    ('9' * 38).to_i
+  ]
+
+  def bind_and_get(input_value, output_type)
+    cursor = @conn.parse("BEGIN :out := :in; END;")
+    cursor.bind_param(:out, output_type)
+    cursor.bind_param(:in, input_value)
+    cursor.exec
+    result = cursor[:out]
+    cursor.close
+    result
+  end
+
+  (POSITIVE_INTS + [0] + POSITIVE_INTS.map(&:-@)).each do |num|
+    define_method("test_bind_param_with_input_of '#{num}'") do
+      assert_equal(OraNumber.new(num.to_s), bind_and_get(num, OraNumber))
+    end
+
+    define_method("test_bind_param_with_output_of '#{num}'") do
+      result = bind_and_get(OraNumber.new(num.to_s), Integer)
+      assert_equal(num, result)
+      assert_kind_of(Integer, result)
+    end
+  end
+
+  def teardown
+    @conn.logoff
+  end
+end

data/test/test_connstr.rb

@@ -80,9 +80,9 @@ class TestConnStr < Minitest::Test
   DESC_TEST_CASE =
     [
      # Cannot distinguish net service names from easy connect strings in this case.
-     ["sales-server", nil, nil, "sales-server"],
+     ["sales-server", nil, nil, false, "sales-server"],
      # Easy Connect string with host.
-     ["//sales-server", nil, nil, <<EOS],
+     ["//sales-server", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
        (SERVICE_NAME=))
@@ -92,7 +92,7 @@ class TestConnStr < Minitest::Test
        (PORT=1521)))
 EOS
      # Easy Connect string with host and port.
-     ["sales-server:3456", nil, nil, <<EOS],
+     ["sales-server:3456", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
        (SERVICE_NAME=))
@@ -102,7 +102,7 @@ EOS
        (PORT=3456)))
 EOS
      # The host name is sales-server and the service name is sales.
-     ["sales-server/sales", nil, nil, <<EOS],
+     ["sales-server/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -112,7 +112,7 @@ EOS
      (PORT=1521)))
 EOS
      # Easy Connect string with IPv6 address.
-     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, <<EOS],
+     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales))
@@ -122,7 +122,7 @@ EOS
       (PORT=80)))
 EOS
      # Easy Connect string with IPv6 host address.
-     ["sales-server:80/sales", nil, nil, <<EOS],
+     ["sales-server:80/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales))
@@ -132,7 +132,7 @@ EOS
       (PORT=80)))
 EOS
      # Easy Connect string with host, service name, and server.
-     ["sales-server/sales:dedicated/inst1", nil, nil, <<EOS],
+     ["sales-server/sales:dedicated/inst1", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales)
@@ -143,7 +143,7 @@ EOS
       (HOST=sales-server)
       (PORT=1521)))
 EOS
-      ["sales-server//inst1", nil, nil, <<EOS],
+      ["sales-server//inst1", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
       (SERVICE_NAME=)
@@ -154,7 +154,7 @@ EOS
       (PORT=1521)))
 EOS
      # 
-     ["sales-server/sales", 20, nil, <<EOS],
+     ["sales-server/sales", 20, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -165,7 +165,7 @@ EOS
   (TRANSPORT_CONNECT_TIMEOUT=20))
 EOS
      # 
-     ["sales-server/sales", nil, 30, <<EOS],
+     ["sales-server/sales", nil, 30, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -176,7 +176,7 @@ EOS
   (CONNECT_TIMEOUT=30))
 EOS
      #
-     ["sales-server/sales", 20, 30, <<EOS],
+     ["sales-server/sales", 20, 30, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -186,6 +186,21 @@ EOS
      (PORT=1521))
   (TRANSPORT_CONNECT_TIMEOUT=20)
   (CONNECT_TIMEOUT=30))
+EOS
+     ["sales-server/sales", 20, 30, true, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales)
+  )
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521)
+  )
+  (TRANSPORT_CONNECT_TIMEOUT=20)
+  (CONNECT_TIMEOUT=30)
+  (ENABLE=BROKEN)
+)
 EOS
     ]
 
@@ -195,9 +210,10 @@ EOS
       easy_connect_string = test_case[0]
       tcp_connnect_timeout= test_case[1]
       outbound_connnect_timeout = test_case[2]
-      expected_result = test_case[3].gsub(/\s/, '')
+      tcp_keepalive = test_case[3]
+      expected_result = test_case[4].gsub(/\s/, '')
       # use instance_eval to call a private method to_connect_descriptor
-      result = obj.instance_eval { to_connect_descriptor(easy_connect_string, tcp_connnect_timeout, outbound_connnect_timeout) }
+      result = obj.instance_eval { to_connect_descriptor(easy_connect_string, tcp_connnect_timeout, outbound_connnect_timeout, tcp_keepalive) }
       assert_equal(expected_result, result, easy_connect_string)
     end
   end

data/test/test_oci8.rb

@@ -216,8 +216,8 @@ EOS
 	assert_nil(rv[4])
 	assert_nil(rv[5])
       else
-	dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, Time.now.utc_offset.to_r/86400)
         tm = Time.local(2000 + i, 8, 3, 23, 59, 59)
+        dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, tm.utc_offset.to_r/86400)
 	dt = Date.civil(2000 + i, 8, 3)
 	assert_equal(tm, rv[3])
 	assert_equal(dttm, rv[4])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  version: 2.2.4
 platform: x86-mingw32
 authors: 
 - Kubo Takehiro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-12-27 00:00:00 +09:00
+date: 2017-06-11 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - docs/install-instant-client.md
 - docs/install-on-osx.md
 - docs/conflicts-local-connections-and-processes.md
+- docs/hanging-after-inactivity.md
 - docs/osx-install-dev-tools.png
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
@@ -82,6 +83,7 @@ files:
 - test/test_bind_raw.rb
 - test/test_bind_string.rb
 - test/test_bind_time.rb
+- test/test_bind_integer.rb
 - test/test_break.rb
 - test/test_clob.rb
 - test/test_connection_pool.rb
@@ -100,11 +102,11 @@ files:
 - test/test_package_type.rb
 - test/test_rowid.rb
 - lib/oci8lib_191.so
-- lib/oci8lib_200.so
 - lib/oci8lib_210.so
-- lib/oci8lib_220.so
-- lib/oci8lib_230.so
+- lib/oci8lib_200.so
 - lib/oci8lib_240.so
+- lib/oci8lib_230.so
+- lib/oci8lib_220.so
 has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
 licenses: