ruby-oci8 2.2.6.1 → 2.2.7

data/ext/oci8/object.c

@@ -680,43 +680,53 @@ static VALUE oci8_named_collection_alloc(VALUE klass)
     return oci8_allocate_typeddata(klass, &oci8_named_collection_data_type);
 }
 
+typedef struct {
+    oci8_bind_t bind;
+    VALUE *obj;
+} bind_named_type_t;
+
 static void bind_named_type_mark(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
 
-    if (oho != NULL) {
+    if (bnt->obj != NULL) {
         ub4 idx = 0;
 
         do {
-            rb_gc_mark(oho[idx].obj);
-        } while (++idx < obind->maxar_sz);
+            rb_gc_mark(bnt->obj[idx]);
+        } while (++idx < bnt->bind.maxar_sz);
     }
-    rb_gc_mark(obind->tdo);
+    rb_gc_mark(bnt->bind.tdo);
 }
 
 static void bind_named_type_free(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
+    void **hp = (void **)bnt->bind.valuep;
 
-    if (oho != NULL) {
+    if (hp != NULL) {
         ub4 idx = 0;
 
         do {
-            if (oho[idx].hp != NULL) {
-                OCIObjectFree(oci8_envhp, oci8_errhp, oho[idx].hp, OCI_DEFAULT);
-                oho[idx].hp = NULL;
+            if (hp[idx] != NULL) {
+                OCIObjectFree(oci8_envhp, oci8_errhp, hp[idx], OCI_DEFAULT);
+                hp[idx] = NULL;
             }
-        } while (++idx < obind->maxar_sz);
+        } while (++idx < bnt->bind.maxar_sz);
+    }
+    if (bnt->obj != NULL) {
+        xfree(bnt->obj);
+        bnt->obj = NULL;
     }
     oci8_bind_free(base);
 }
 
 static VALUE bind_named_type_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)data;
-    return oho->obj;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    ub4 idx = obind->curar_idx;
+
+    return bnt->obj[idx];
 }
 
 static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
@@ -726,10 +736,12 @@ static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_stru
 
 static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
 {
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
     VALUE tdo_obj = length;
 
     obind->value_sz = sizeof(void*);
-    obind->alloc_sz = sizeof(oci8_hp_obj_t);
+    obind->alloc_sz = sizeof(void*);
+    bnt->obj = xcalloc(sizeof(VALUE), obind->maxar_sz ? obind->maxar_sz : 1);
 
     CHECK_TDO(tdo_obj);
     RB_OBJ_WRITE(obind->base.self, &obind->tdo, tdo_obj);
@@ -737,7 +749,8 @@ static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE
 
 static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    void **hp = (void **)obind->valuep;
     oci8_base_t *tdo = DATA_PTR(obind->tdo);
     OCITypeCode tc = OCITypeTypeCode(oci8_envhp, oci8_errhp, tdo->hp.tdo);
     VALUE klass = Qnil;
@@ -755,14 +768,14 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
     }
     svcctx = oci8_get_svcctx(svc);
     do {
-        oho[idx].obj = rb_class_new_instance(0, NULL, klass);
-        RB_OBJ_WRITTEN(obind->base.self, Qundef, oho[idx].obj);
-        obj = DATA_PTR(oho[idx].obj);
-        RB_OBJ_WRITE(oho[idx].obj, &obj->tdo, obind->tdo);
-        obj->instancep = (char**)&oho[idx].hp;
+        bnt->obj[idx] = rb_class_new_instance(0, NULL, klass);
+        RB_OBJ_WRITTEN(obind->base.self, Qundef, bnt->obj[idx]);
+        obj = DATA_PTR(bnt->obj[idx]);
+        RB_OBJ_WRITE(bnt->obj[idx], &obj->tdo, obind->tdo);
+        obj->instancep = (char**)&hp[idx];
         obj->null_structp = (char**)&obind->u.null_structs[idx];
         oci8_link_to_parent(&obj->base, &obind->base);
-        RB_OBJ_WRITTEN(oho[idx].obj, Qundef, obind->base.self);
+        RB_OBJ_WRITTEN(bnt->obj[idx], Qundef, obind->base.self);
 
         chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep),
                &svcctx->base);
@@ -804,7 +817,7 @@ static const oci8_bind_data_type_t bind_named_type_data_type = {
 #endif
         },
         bind_named_type_free,
-        sizeof(oci8_bind_t)
+        sizeof(bind_named_type_t)
     },
     bind_named_type_get,
     bind_named_type_set,

data/ext/oci8/oci8.c

@@ -2,7 +2,7 @@
 /*
  * oci8.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2019 Kubo Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -734,14 +734,9 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 /*
  * @overload long_read_len
  *
- *  Gets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column. The default value is 65535.
- *
- *  If the actual data length is longer than long_read_len,
- *  the fetched valud is truncated and the value of {OCI8#last_error}
- *  become {OCISuccessWithInfo} whose message is "ORA-01406: fetched column value was truncated".
- *
- *  Note: long_read_len is also used for maximum length of XMLTYPE data type.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @return [Integer]
  *  @see #long_read_len=
@@ -749,14 +744,16 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 static VALUE oci8_long_read_len(VALUE self)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
+    rb_warning("OCI8.long_read_len has no effect since ruby-oci8 2.2.7");
     return svcctx->long_read_len;
 }
 
 /*
  * @overload long_read_len=(length)
  *
- *  Sets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @param [Integer] length
  *  @see #long_read_len
@@ -766,6 +763,7 @@ static VALUE oci8_set_long_read_len(VALUE self, VALUE val)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
     Check_Type(val, T_FIXNUM);
     RB_OBJ_WRITE(self, &svcctx->long_read_len, val);
+    rb_warning("OCI8.long_read_len= has no effect since ruby-oci8 2.2.7");
     return val;
 }
 

data/ext/oci8/oraconf.rb

@@ -584,7 +584,7 @@ EOS
     if try_run("int main() { return 0; }")
       puts "ok"
     else
-      puts "ng"
+      puts "failed"
       raise "C compiler doesn't work correctly."
     end
   end # check_cc
@@ -630,7 +630,7 @@ EOS
     STDOUT.flush
     rubyhdrdir = RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG['archdir']
     unless File.exist?(rubyhdrdir + '/ruby.h')
-      puts "ng"
+      puts "failed"
       if RUBY_PLATFORM =~ /darwin/ and File.exist?("#{RbConfig::CONFIG['archdir']}/../universal-darwin8.0/ruby.h")
         raise <<EOS
 #{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.

data/ext/oci8/stmt.c

@@ -15,7 +15,8 @@ static VALUE cOCIStmt;
 typedef struct {
     oci8_base_t base;
     VALUE svc;
-    int use_stmt_release;
+    char use_stmt_release;
+    char end_of_fetch;
 } oci8_stmt_t;
 
 static void oci8_stmt_mark(oci8_base_t *base)
@@ -111,12 +112,24 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
     oci8_bind_t *obind = TO_BIND(vbindobj);
     const oci8_bind_data_type_t *data_type;
     sword status;
+    void *valuep;
+    void *indp;
+    ub4 mode;
 
     if (obind->base.hp.dfn != NULL) {
         oci8_base_free(&obind->base); /* TODO: OK? */
     }
     data_type = (const oci8_bind_data_type_t *)obind->base.data_type;
-    status = OCIDefineByPos(stmt->base.hp.stmt, &obind->base.hp.dfn, oci8_errhp, position, obind->valuep, obind->value_sz, data_type->dty, NIL_P(obind->tdo) ? obind->u.inds : NULL, NULL, 0, OCI_DEFAULT);
+    if (obind->value_sz != SB4MAXVAL) {
+        valuep = obind->valuep;
+        indp = NIL_P(obind->tdo) ? obind->u.inds : NULL;
+        mode = OCI_DEFAULT;
+    } else {
+        valuep = NULL;
+        indp = NULL;
+        mode = OCI_DYNAMIC_FETCH;
+    }
+    status = OCIDefineByPos(stmt->base.hp.stmt, &obind->base.hp.dfn, oci8_errhp, position, valuep, obind->value_sz, data_type->dty, indp, NULL, 0, mode);
     if (status != OCI_SUCCESS) {
         chker3(status, &stmt->base, stmt->base.hp.ptr);
     }
@@ -151,7 +164,9 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     oci8_bind_t *obind;
     const oci8_bind_data_type_t *data_type;
     sword status;
+    void *valuep;
     void *indp;
+    ub4 mode;
 
     if (NIL_P(vplaceholder)) { /* 1 */
         placeholder_ptr = NULL;
@@ -185,11 +200,19 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     }
     data_type = (const oci8_bind_data_type_t *)obind->base.data_type;
 
-    indp = NIL_P(obind->tdo) ? obind->u.inds : NULL;
+    if (obind->value_sz != SB4MAXVAL) {
+        valuep = obind->valuep;
+        indp = NIL_P(obind->tdo) ? obind->u.inds : NULL;
+        mode = OCI_DEFAULT;
+    } else {
+        valuep = NULL;
+        indp = NULL;
+        mode = OCI_DATA_AT_EXEC;
+    }
     if (placeholder_ptr == (char*)-1) {
-        status = OCIBindByPos(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, position, obind->valuep, obind->value_sz, data_type->dty, indp, NULL, 0, 0, 0, OCI_DEFAULT);
+        status = OCIBindByPos(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, position, valuep, obind->value_sz, data_type->dty, indp, NULL, 0, 0, 0, mode);
     } else {
-        status = OCIBindByName(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, TO_ORATEXT(placeholder_ptr), placeholder_len, obind->valuep, obind->value_sz, data_type->dty, indp, NULL, 0, 0, 0, OCI_DEFAULT);
+        status = OCIBindByName(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, TO_ORATEXT(placeholder_ptr), placeholder_len, valuep, obind->value_sz, data_type->dty, indp, NULL, 0, 0, 0, mode);
     }
     if (status != OCI_SUCCESS) {
         chker3(status, &stmt->base, stmt->base.hp.stmt);
@@ -238,6 +261,7 @@ static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
     oci8_stmt_t *stmt = TO_STMT(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(stmt->svc);
 
+    stmt->end_of_fetch = 0;
     chker3(oci8_call_stmt_execute(svcctx, stmt, NUM2UINT(iteration_count),
                                   svcctx->is_autocommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT),
            &stmt->base, stmt->base.hp.stmt);
@@ -245,7 +269,7 @@ static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
 }
 
 /*
- * @overload __fetch(connection)
+ * @overload __fetch(connection, max_rows)
  *
  *  Fetches one row and set the result to <code>@define_handles</code>.
  *  This is called by private methods of OCI8::Cursor.
@@ -255,13 +279,18 @@ static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
  *
  *  @private
  */
-static VALUE oci8_stmt_fetch(VALUE self, VALUE svc)
+static VALUE oci8_stmt_fetch(VALUE self, VALUE svc, VALUE max_rows)
 {
     oci8_stmt_t *stmt = TO_STMT(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
     sword rv;
     oci8_bind_t *obind;
     const oci8_bind_data_type_t *data_type;
+    ub4 nrows = NUM2UINT(max_rows);
+
+    if (stmt->end_of_fetch) {
+        return Qnil;
+    }
 
     if (stmt->base.children != NULL) {
         obind = (oci8_bind_t *)stmt->base.children;
@@ -271,16 +300,22 @@ static VALUE oci8_stmt_fetch(VALUE self, VALUE svc)
                 if (data_type->pre_fetch_hook != NULL) {
                     data_type->pre_fetch_hook(obind, stmt->svc);
                 }
+                if (nrows > 1 && nrows != obind->maxar_sz) {
+                    rb_raise(rb_eRuntimeError, "fetch size (%u) != define-handle size %u", nrows, obind->maxar_sz);
+                }
             }
             obind = (oci8_bind_t *)obind->base.next;
         } while (obind != (oci8_bind_t*)stmt->base.children);
     }
-    rv = OCIStmtFetch_nb(svcctx, stmt->base.hp.stmt, oci8_errhp, 1, OCI_FETCH_NEXT, OCI_DEFAULT);
+    rv = OCIStmtFetch_nb(svcctx, stmt->base.hp.stmt, oci8_errhp, nrows, OCI_FETCH_NEXT, OCI_DEFAULT);
     if (rv == OCI_NO_DATA) {
-        return Qfalse;
+        stmt->end_of_fetch = 1;
+    } else {
+        chker3(rv, &svcctx->base, stmt->base.hp.stmt);
     }
-    chker3(rv, &svcctx->base, stmt->base.hp.stmt);
-    return Qtrue;
+    chker2(OCIAttrGet(stmt->base.hp.stmt, OCI_HTYPE_STMT, &nrows, 0, OCI_ATTR_ROWS_FETCHED, oci8_errhp),
+           &svcctx->base);
+    return nrows ? UINT2NUM(nrows) : Qnil;
 }
 
 /*
@@ -405,7 +440,7 @@ void Init_oci8_stmt(VALUE cOCI8)
     rb_define_private_method(cOCIStmt, "__define", oci8_define_by_pos, 2);
     rb_define_private_method(cOCIStmt, "__bind", oci8_bind, 2);
     rb_define_private_method(cOCIStmt, "__execute", oci8_stmt_execute, 1);
-    rb_define_private_method(cOCIStmt, "__fetch", oci8_stmt_fetch, 1);
+    rb_define_private_method(cOCIStmt, "__fetch", oci8_stmt_fetch, 2);
     rb_define_private_method(cOCIStmt, "__paramGet", oci8_stmt_get_param, 1);
     rb_define_method(cOCIStmt, "rowid", oci8_stmt_get_rowid, 0);
 

data/lib/oci8.rb

@@ -95,7 +95,7 @@ begin
 
   ruby_arch = [nil].pack('P').size == 8 ? :x64 : :x86
   ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    if dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
+    if !path.empty? && dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
       dll_dir = RubyInstaller::Runtime.add_dll_directory(path)
       break
     end

data/lib/oci8/bindtype.rb

@@ -172,20 +172,6 @@ class OCI8
       end
     end
 
-    class Long < OCI8::BindType::String
-      def self.create(con, val, param, max_array_size)
-        param = {:length => con.long_read_len, :char_semantics => true}
-        super(con, val, param, max_array_size)
-      end
-    end
-
-    class LongRaw < OCI8::BindType::RAW
-      def self.create(con, val, param, max_array_size)
-        param = {:length => con.long_read_len, :char_semantics => false}
-        self.new(con, val, param, max_array_size)
-      end
-    end
-
     class CLOB
       def self.create(con, val, param, max_array_size)
         if param.is_a? OCI8::Metadata::Base and param.charset_form == :nchar

data/lib/oci8/check_load_error.rb

@@ -6,14 +6,24 @@ class OCI8
     case RUBY_PLATFORM
     when /mswin32|cygwin|mingw32|bccwin32/
 
-      require 'Win32API'
+      require 'fiddle/import'
+      require 'fiddle/types'
+
+      extend Fiddle::Importer
+      dlload 'kernel32.dll'
+      include Fiddle::BasicTypes
+      include Fiddle::Win32Types
+
+      typealias "HANDLE", "void*"
+      typealias "HMODULE", "void*"
+      extern "DWORD GetModuleFileNameA(HMODULE, LPSTR, DWORD)"
+      extern "UINT GetSystemDirectoryA(LPCSTR, UINT)"
+      extern "UINT GetWindowsDirectoryA(LPCSTR, UINT)"
+      extern "HMODULE LoadLibraryExA(LPCSTR, HANDLE, DWORD)"
+      extern "BOOL FreeLibrary(HMODULE)"
+
       MAX_PATH = 260
-      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
+      DONT_RESOLVE_DLL_REFERENCES = 0x00000001
 
       def self.check_os_specific_load_error(exc)
         case exc.message
@@ -23,25 +33,50 @@ class OCI8
             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.
+          oci_dll_files = dll_load_path_list.inject([]) do |files, path|
+            file = File.join(path, '\OCI.DLL')
+            files << file if File.exist?(file)
+            files
+          end
+          if oci_dll_files.empty?
+            raise LoadError, "Cannot find OCI.DLL in PATH."
+          end
+          if oci_dll_files.none? {|file| open(file, 'rb') {true} rescue false}
+            raise LoadError, "OCI.DLL in PATH isn't readable."
+          end
+          first_error = nil
+          oci_dll_files.each do |file|
+            begin
+              check_win32_pe_arch(file, "Oracle client")
+              valid_arch = true
+            rescue LoadError
+              first_error ||= $!
+              valid_arch = false
+            end
+            if valid_arch
+              handle = LoadLibraryExA(file, nil, DONT_RESOLVE_DLL_REFERENCES)
+              unless handle.null?
+                FreeLibrary(handle)
+                raise LoadError, <<EOS
+Cannot find DLLs depended by #{file}.
 See http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-instant-client.md#Windows
 EOS
+              end
+              break
+            end
           end
+          raise first_error if first_error
         end
       end # self.check_os_specific_load_error
 
       def self.dll_load_path_list
         buf = "\0" * MAX_PATH
         paths = []
-        paths << buf[0, GetModuleFileNameA.call(nil, buf, MAX_PATH)].force_encoding("locale").gsub(/\\[^\\]*$/, '')
-        paths << buf[0, GetSystemDirectoryA.call(buf, MAX_PATH)].force_encoding("locale")
-        paths << buf[0, GetWindowsDirectoryA.call(buf, MAX_PATH)].force_encoding("locale")
+        paths << buf[0, GetModuleFileNameA(nil, buf, MAX_PATH)].force_encoding("locale").gsub(/\\[^\\]*$/, '')
+        paths << buf[0, GetSystemDirectoryA(buf, MAX_PATH)].force_encoding("locale")
+        paths << buf[0, GetWindowsDirectoryA(buf, MAX_PATH)].force_encoding("locale")
         paths << "."
-        paths + ENV['PATH'].split(';')
+        paths + (ENV['PATH'].split(';').reject {|path| path.empty?})
       end # self.dll_load_path_list
 
       def self.check_win32_pe_arch(filename, package)