ruby-oci8 2.2.4.1 → 2.2.5

data/lib/oci8/bindtype.rb

@@ -49,7 +49,7 @@ class OCI8
 
     class BasicNumberType < OCI8::BindType::OraNumber
       def get()
-        (val = super()) && (val.has_decimal_part? ? val.to_f : val.to_i)
+        (val = super()) && (val.has_fractional_part? ? val.to_f : val.to_i)
       end
     end
 

data/lib/oci8/check_load_error.rb

@@ -8,17 +8,29 @@ class OCI8
 
       require 'Win32API'
       MAX_PATH = 260
-      GetModuleFileNameA = Win32API.new('kernel32', 'GetModuleFileNameA', 'PPL', 'L')
-      GetSystemDirectoryA = Win32API.new('kernel32', 'GetSystemDirectoryA', 'PL', 'L')
-      GetWindowsDirectoryA = Win32API.new('kernel32', 'GetWindowsDirectoryA', 'PL', 'L')
+      GetModuleFileNameA = Win32API.new('kernel32.dll', 'GetModuleFileNameA', 'PPL', 'L')
+      GetSystemDirectoryA = Win32API.new('kernel32.dll', 'GetSystemDirectoryA', 'PL', 'L')
+      GetWindowsDirectoryA = Win32API.new('kernel32.dll', 'GetWindowsDirectoryA', 'PL', 'L')
+      LoadLibraryExA = Win32API.new('kernel32.dll', 'LoadLibraryExA', 'PPL', 'P')
+      FreeLibrary = Win32API.new('kernel32.dll', 'FreeLibrary', 'P', 'L')
+      LOAD_LIBRARY_AS_IMAGE_RESOURCE = 0x00000020
 
       def self.check_os_specific_load_error(exc)
         case exc.message
-        when /^193: / # "193: %1 is not a valid Win32 application." in English
+        when /^OCI\.DLL: 193\(/, /^193: / # "OCI.DLL: 193(%1 is not a valid Win32 application.)" in English
           check_win32_pe_arch(exc.message.split(' - ')[1], "ruby-oci8")
           dll_load_path_list.each do |path|
             check_win32_pe_arch(File.join(path, '\OCI.DLL'), "Oracle client")
           end
+        when /^OCI.DLL: 126\(/, /^126: / # "OCI.DLL: 126(The specified module could not be found.)" in English
+          handle = LoadLibraryExA.call('OCI.DLL', nil, LOAD_LIBRARY_AS_IMAGE_RESOURCE)
+          unless handle.null?
+            FreeLibrary.call(handle)
+            raise LoadError, <<EOS
+OCI.DLL is in the PATH but its dependent modules are not found.
+See http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-instant-client.md#Windows
+EOS
+          end
         end
       end # self.check_os_specific_load_error
 

data/lib/oci8/cursor.rb

@@ -125,7 +125,8 @@ class OCI8
       case type
       when :select_stmt
         __execute(0)
-        define_columns()
+        define_columns() if @column_metadata.size == 0
+        @column_metadata.size
       else
         __execute(1)
         row_count
@@ -526,9 +527,6 @@ class OCI8
     def define_one_column(pos, param)
       bindobj = make_bind_object(param)
       __define(pos, bindobj)
-      if old = @define_handles[pos - 1]
-        old.send(:free)
-      end
       @define_handles[pos - 1] = bindobj
     end
 

data/lib/oci8/oci8.rb

@@ -113,7 +113,7 @@ class OCI8
     if dbname.is_a? OCI8::ConnectionPool
       @pool = dbname # to prevent GC from freeing the connection pool.
       dbname = dbname.send(:pool_name)
-      attach_mode |= 0x0200 # OCI_CPOOL and OCI_LOGON2_CPOOL
+      attach_mode |= 0x0200 # OCI_CPOOL
     else
       tcp_connect_timeout = OCI8::properties[:tcp_connect_timeout]
       connect_timeout = OCI8::properties[:connect_timeout]
@@ -124,32 +124,27 @@ class OCI8
     end
     if stmt_cache_size
       # enable statement caching
-      attach_mode |= 0x0004 # OCI_STMT_CACHE and OCI_LOGON2_STMTCACHE
+      attach_mode |= 0x0004 # OCI_STMT_CACHE
     end
 
-    if true
-      # logon by the OCI function OCISessionBegin().
-      allocate_handles()
-      @session_handle.send(:attr_set_string, OCI_ATTR_USERNAME, username) if username
-      @session_handle.send(:attr_set_string, OCI_ATTR_PASSWORD, password) if password
-      if @@oracle_client_version >= ORAVER_11_1
-        # Sets the driver name displayed in V$SESSION_CONNECT_INFO.CLIENT_DRIVER
-        # if both the client and the server are Oracle 11g or upper.
-        # Only the first 8 chracters "ruby-oci" are displayed when the Oracle
-        # server version is lower than 12.0.1.2.
-        # 424: OCI_ATTR_DRIVER_NAME
-        @session_handle.send(:attr_set_string, 424, "ruby-oci8 : #{OCI8::VERSION}")
-      end
-      server_attach(dbname, attach_mode)
-      if OCI8.oracle_client_version >= OCI8::ORAVER_11_1
-        self.send_timeout = OCI8::properties[:send_timeout] if OCI8::properties[:send_timeout]
-        self.recv_timeout = OCI8::properties[:recv_timeout] if OCI8::properties[:recv_timeout]
-      end
-      session_begin(cred ? cred : OCI_CRED_RDBMS, auth_mode)
-    else
-      # logon by the OCI function OCILogon2().
-      logon2(username, password, dbname, attach_mode)
+    # logon by the OCI function OCISessionBegin().
+    allocate_handles()
+    @session_handle.send(:attr_set_string, OCI_ATTR_USERNAME, username) if username
+    @session_handle.send(:attr_set_string, OCI_ATTR_PASSWORD, password) if password
+    if @@oracle_client_version >= ORAVER_11_1
+      # Sets the driver name displayed in V$SESSION_CONNECT_INFO.CLIENT_DRIVER
+      # if both the client and the server are Oracle 11g or upper.
+      # Only the first 8 chracters "ruby-oci" are displayed when the Oracle
+      # server version is lower than 12.0.1.2.
+      # 424: OCI_ATTR_DRIVER_NAME
+      @session_handle.send(:attr_set_string, 424, "ruby-oci8 : #{OCI8::VERSION}")
+    end
+    server_attach(dbname, attach_mode)
+    if OCI8.oracle_client_version >= OCI8::ORAVER_11_1
+      self.send_timeout = OCI8::properties[:send_timeout] if OCI8::properties[:send_timeout]
+      self.recv_timeout = OCI8::properties[:recv_timeout] if OCI8::properties[:recv_timeout]
     end
+    session_begin(cred ? cred : OCI_CRED_RDBMS, auth_mode)
 
     if stmt_cache_size
       # set statement cache size

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.4.1"
+  VERSION = "2.2.5"
 end

data/test/setup_test_package.sql

@@ -0,0 +1,59 @@
+create or replace package rb_test_pkg is
+  package_version pls_integer := 1;
+
+  type array_of_integer is array(50) of integer;
+  type table_of_pls_integer is table of pls_integer;
+  type table_of_boolean is table of boolean;
+  type indexed_table_of_varchar2 is table of varchar2(10) index by varchar2(5);
+  type rec1 is record (i pls_integer, j integer);
+  type rec2 is record (b boolean, it indexed_table_of_varchar2, rec rec1);
+  type table_of_rec1 is table of rec1;
+  type table_of_rec2 is table of rec2;
+
+  function sum_table_of_pls_integer(tbl in table_of_pls_integer) return pls_integer;
+  function add_rec1_values(tbl in table_of_rec1) return pls_integer;
+  procedure out_rec1_values(tbl out table_of_rec1);
+end;
+/
+create or replace package body rb_test_pkg is
+  function sum_table_of_pls_integer(tbl in table_of_pls_integer) return pls_integer is
+    i pls_integer;
+    ret pls_integer := 0;
+  begin
+    for i in tbl.first..tbl.last loop
+      ret := ret + tbl(i);
+    end loop;
+    return ret;
+  end;
+
+  function add_rec1_values(tbl in table_of_rec1) return pls_integer is
+    i pls_integer;
+    ret pls_integer := 0;
+  begin
+    for i in tbl.first..tbl.last loop
+      ret := ret + nvl(tbl(i).i, 0) + nvl(tbl(i).j, 0);
+    end loop;
+    return ret;
+  end;
+
+  procedure out_rec1_values(tbl out table_of_rec1) is
+    i pls_integer;
+    rec1val rec1;
+  begin
+    tbl := table_of_rec1();
+    for i in 1..20 loop
+      tbl.extend;
+      if i mod 6 != 0 then
+        if i mod 3 != 0 then
+          rec1val.i := i;
+          rec1val.j := i;
+        else
+          rec1val.i := null;
+          rec1val.j := null;
+        end if;
+        tbl(i) := rec1val;
+      end if;
+    end loop;
+  end;
+end;
+/

data/test/test_bind_boolean.rb

@@ -0,0 +1,99 @@
+# Low-level API
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestBindBoolean < Minitest::Test
+  def setup
+    @conn = get_oci8_connection()
+  end
+
+  def test_set_raw
+    stmt = <<EOS
+DECLARE
+  bool_val boolean;
+  int_val pls_integer;
+BEGIN
+  bool_val := :in;
+  IF bool_val THEN
+    int_val := 1;
+  ELSE
+    int_val := 0;
+  END IF;
+  :out := int_val;
+END;
+EOS
+    # explicit bind
+    cursor = @conn.parse(stmt)
+    cursor.bind_param(:in, nil, TrueClass)
+    cursor.bind_param(:out, nil, Integer)
+
+    cursor[:in] = true
+    cursor.exec
+    assert_equal(1, cursor[:out])
+
+    cursor[:in] = false
+    cursor.exec
+    assert_equal(0, cursor[:out])
+
+    # implicit bind
+    do_block_cnt = 0
+    @conn.exec(stmt, true, 0) do |in_val, out_val|
+      assert_equal(true, in_val)
+      assert_equal(1, out_val)
+      do_block_cnt += 1
+    end
+
+    @conn.exec(stmt, false, 0) do |in_val, out_val|
+      assert_equal(false, in_val)
+      assert_equal(0, out_val)
+      do_block_cnt += 1
+    end
+    assert_equal(2, do_block_cnt)
+  end
+
+  def test_get_raw
+    stmt = <<EOS
+DECLARE
+  int_val pls_integer;
+  bool_val boolean;
+BEGIN
+  int_val := :in;
+  IF int_val <> 0 THEN
+    bool_val := TRUE;
+  ELSE
+    bool_val := FALSE;
+  END IF;
+  :out := bool_val;
+END;
+EOS
+    cursor = @conn.parse(stmt)
+    cursor.bind_param(:in, nil, Integer)
+    cursor.bind_param(:out, nil, TrueClass)
+
+    cursor[:in] = 1
+    cursor.exec
+    assert_equal(true, cursor[:out])
+
+    cursor[:in] = 0
+    cursor.exec
+    assert_equal(false, cursor[:out])
+
+    do_block_cnt = 0
+    @conn.exec(stmt, 1, true) do |in_val, out_val|
+      assert_equal(1, in_val)
+      assert_equal(true, out_val)
+      do_block_cnt += 1
+    end
+
+    @conn.exec(stmt, 0, true) do |in_val, out_val|
+      assert_equal(0, in_val)
+      assert_equal(false, out_val)
+      do_block_cnt += 1
+    end
+    assert_equal(2, do_block_cnt)
+  end
+
+  def teardown
+    @conn.logoff
+  end
+end

data/test/test_oranumber.rb

@@ -738,9 +738,9 @@ EOS
     LARGE_RANGE_VALUES
   end
 
-  def test_has_decimal_part
-    assert_equal(false, OraNumber(10.0).has_decimal_part?)
-    assert_equal(true,  OraNumber(10.1).has_decimal_part?)
+  def test_has_fractional_part
+    assert_equal(false, OraNumber(10.0).has_fractional_part?)
+    assert_equal(true,  OraNumber(10.1).has_fractional_part?)
   end
 
   def test_float_conversion_type_ruby

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 4
-  - 1
-  version: 2.2.4.1
+  - 5
+  version: 2.2.5
 platform: ruby
 authors: 
 - Kubo Takehiro
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-06-17 00:00:00 +09:00
+date: 2017-10-21 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -43,12 +42,14 @@ files:
 - ruby-oci8.gemspec
 - setup.rb
 - docs/bind-array-to-in_cond.md
+- docs/conflicts-local-connections-and-processes.md
+- docs/hanging-after-inactivity.md
 - docs/install-binary-package.md
 - docs/install-full-client.md
 - docs/install-instant-client.md
 - docs/install-on-osx.md
-- docs/conflicts-local-connections-and-processes.md
-- docs/hanging-after-inactivity.md
+- docs/ldap-auth-and-function-interposition.md
+- docs/number-type-mapping.md
 - docs/osx-install-dev-tools.png
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
@@ -113,10 +114,12 @@ files:
 - test/README
 - test/config.rb
 - test/setup_test_object.sql
+- test/setup_test_package.sql
 - test/test_all.rb
 - test/test_appinfo.rb
 - test/test_array_dml.rb
 - test/test_bind_array.rb
+- test/test_bind_boolean.rb
 - test/test_bind_raw.rb
 - test/test_bind_string.rb
 - test/test_bind_time.rb