ruby-oci8 2.2.10 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca16dcc5691bc79740b2b6e308315d013c3f482f991325f70a129a7cf34de0c
-  data.tar.gz: c953f017dab68ed7c2a3934ec29b7312c401516a04b44d32f53c83b0015988b9
+  metadata.gz: c98e1080c073f6f2f2a67676f754259e8c20d2ef95d6abbb1015fd62df569d84
+  data.tar.gz: 4a14e505c268c3a2b408c9f4881026dd32bbe6e4276df83c77483e0402bb32b1
 SHA512:
-  metadata.gz: 3c54d89e2b858e9dcd874d3f9351c707443d1171154c1d9145f3ddd0931e3168809fc3e91ef1cbc1dca2e6b4e699e5eb2e5d05a7e320cfb0926359a71ff9b3d9
-  data.tar.gz: 611469d0047283c54b7110090bcd9e45a677c3afaba9f6b1c6c4efbaca8afd3092ee1b871d28149459fa82f52f12e36d71bae6cb99e37be0c5ecb148ae300ead
+  metadata.gz: 1e73a635ede56087026f6b573c2f1f6624d7a265423a91ab1d7592534f6c132a1e4f1ca812e4a2651f690588f39c8c82040d20fcc9719fa0028a67c230e76e1d
+  data.tar.gz: 57497720f51ed3d2062ed8dc5eb07b248d3b19326e7c83a2cd508aaec0e7f3d33b658eb0605134776913cffc631e57b9e6b97d8b6367e5cf59dd83d24e0c749d

data/ChangeLog

@@ -1,3 +1,5 @@
+This file has not been not updated. See commit log at https://github.com/kubo/ruby-oci8.
+
 2020-12-30  Kubo Takehiro <kubo@jiubao.org>
 	* NEWS: Add changes between 2.2.8 and 2.2.9.
 	* lib/oci8/version.rb: Update to 2.2.9.

data/NEWS

@@ -1,5 +1,21 @@
 # @markup markdown
 
+2.2.12 (2022-12-30)
+===================
+
+- Fix warning: undefining the allocator of T_DATA class OraNumber against Ruby 3.2.0dev. (GH-243)
+- Fix warnings on tests and on compile.
+- Remove code for old ruby versions.
+
+2.2.11 (2022-02-22)
+===================
+
+- Fix "No DLL is not foud to hook" when `OCI8.properties[:tcp_keepalive_time]` is set and Oracle client is 21c on Windows.
+
+  (reported at rsim/oracle-enhanced#2262)
+
+- Fix "OCI8.properties[:tcp_keepalive_time] isn't available" error when ruby version is 3.1 on Windows.
+
 2.2.10 (2022-01-12)
 ===================
 

data/ext/oci8/extconf.rb

@@ -72,7 +72,7 @@ $objs = ["oci8lib.o", "env.o", "error.o", "oci8.o", "ocihandle.o",
          "ocinumber.o", "ocidatetime.o", "object.o", "apiwrap.o",
          "encoding.o", "oranumber_util.o", "thread_util.o", "util.o"]
 
-if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/
+if RUBY_PLATFORM =~ /mswin32|cygwin|mingw/
   $defs << "-DUSE_WIN32_C"
   $objs << "win32.o"
 end
@@ -148,7 +148,7 @@ end
 print "checking for plthook... "
 STDOUT.flush
 case RUBY_PLATFORM
-when /mswin32|cygwin|mingw32|bccwin32/
+when /mswin32|cygwin|mingw/
   plthook_src = "plthook_win32.c"
 when /darwin/
   plthook_src = "plthook_osx.c"

data/ext/oci8/hook_funcs.c

@@ -170,6 +170,38 @@ static int WSAAPI hook_WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount
     return rv;
 }
 
+static int is_target_dll(MODULEENTRY32 *me)
+{
+    static const char *basenames[] = {
+        "orantcp", // ORACLE_HOME-based client
+        "oraociei", // instant client basic
+        "oraociicus", // instant client basic lite
+        NULL,
+    };
+    const char **basename = basenames;
+    while (*basename != NULL) {
+        if (strnicmp(me->szModule, *basename, strlen(*basename)) == 0) {
+            break;
+        }
+        basename++;
+    }
+    if (*basename == NULL) {
+        return 0;
+    }
+    // basename{zero_or_more_digits}.dll
+    const char *p = me->szModule + strlen(*basename);
+    while ('0' <= *p && *p <= '9') {
+        p++;
+    }
+    if (stricmp(p, ".dll") != 0) {
+        return 0;
+    }
+    if (GetProcAddress((HMODULE)me->modBaseAddr, "nttini") == NULL) {
+        return 0;
+    }
+    return 1;
+}
+
 void oci8_install_hook_functions()
 {
     static int hook_functions_installed = 0;
@@ -217,22 +249,11 @@ void oci8_install_hook_functions()
     me.dwSize = sizeof(me);
     if (Module32First(hSnapshot, &me)) {
         do {
-            const char *p = NULL;
-            if (strnicmp(me.szModule, "orantcp", 7) == 0) { // ORACLE_HOME-based client
-                p = me.szModule + 7;
-            } else if (strnicmp(me.szModule, "oraociei", 8) == 0) { // instant client basic
-                p = me.szModule + 8;
-            } else if (strnicmp(me.szModule, "oraociicus", 10) == 0) { // instant client basic lite
-                p = me.szModule + 10;
-            }
-            if (p != NULL && ('1' <= *p && *p <= '9') && ('0' <= *(p + 1) && *(p + 1) <= '9')
-                && stricmp(p + 2, ".dll") == 0) {
-                if (GetProcAddress((HMODULE)me.modBaseAddr, "nttini") != NULL) {
-                    module_found = TRUE;
-                    if (replace_functions(me.modBaseAddr, me.szExePath, tcp_functions) != 0) {
-                        CloseHandle(hSnapshot);
-                        rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
-                    }
+            if (is_target_dll(&me)) {
+                module_found = TRUE;
+                if (replace_functions(me.modBaseAddr, me.szExePath, tcp_functions) != 0) {
+                    CloseHandle(hSnapshot);
+                    rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
                 }
             }
         } while (Module32Next(hSnapshot, &me));

data/ext/oci8/oci8.h

@@ -89,88 +89,6 @@ typedef orasb8 sb8;
 #endif
 #endif
 
-/*
- * Use TypedData on ruby 1.9.3 and later.
- */
-#ifndef HAVE_RB_DATA_TYPE_T_FUNCTION
-
-/*
- * Don't use TypedData even though ruby 1.9.2 has it because the
- * definitions are slightly different from ruby 1.9.3 and later.
- */
-#define rb_data_type_t oci8_data_type_t
-#undef TypedData_Make_Struct
-#undef TypedData_Wrap_Struct
-#undef TypedData_Get_Struct
-#undef RTYPEDDATA_DATA
-#undef RUBY_DEFAULT_FREE
-
-/*
- * To pass compilation on ruby 1.9.2 and earlier.
- */
-typedef struct oci8_data_type_struct rb_data_type_t;
-struct oci8_data_type_struct {
-    const char *wrap_struct_name;
-    struct {
-        void (*dmark)(void*);
-        void (*dfree)(void*);
-        size_t (*dsize)(const void *);
-    } function;
-    const rb_data_type_t *parent;
-    void *data;
-};
-#define TypedData_Make_Struct(klass, type, data_type, sval) \
-             Data_Make_Struct((klass), type, (data_type)->function.dmark, (data_type)->function.dfree, (sval))
-#define TypedData_Wrap_Struct(klass, data_type, sval) \
-             Data_Wrap_Struct((klass), (data_type)->function.dmark, (data_type)->function.dfree, (sval))
-#define TypedData_Get_Struct(obj, type, data_type, sval) \
-             Data_Get_Struct((obj), type, (sval))
-#define RTYPEDDATA_DATA(obj) DATA_PTR(obj)
-#define RUBY_DEFAULT_FREE xfree
-#endif
-
-/* a new function in ruby 1.9.3.
- * define a compatible macro for ruby 1.9.2 or lower.
- */
-#ifndef HAVE_RB_CLASS_SUPERCLASS
-#ifdef RCLASS_SUPER
-#define rb_class_superclass(cls) RCLASS_SUPER(cls)
-#else
-#define rb_class_superclass(cls) (RCLASS(cls)->super)
-#endif
-#endif
-
-/* new macros in ruby 2.1.0
- */
-#ifndef RARRAY_AREF
-#define RARRAY_AREF(a, i)    (RARRAY_PTR(a)[i])
-#endif
-#ifndef RARRAY_CONST_PTR
-#define RARRAY_CONST_PTR(a)  RARRAY_PTR(a)
-#endif
-#ifndef RB_OBJ_WRITE
-#define RB_OBJ_WRITE(a, slot, b)   do {*(slot) = (b);} while (0)
-#endif
-#ifndef RB_OBJ_WRITTEN
-#define RB_OBJ_WRITTEN(a, oldv, b) do {(void)oldv;} while (0)
-#endif
-
-/* new macros in ruby 2.4.0
- */
-#ifndef ALWAYS_INLINE
-#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-/* gcc version >= 3.1 */
-#define ALWAYS_INLINE(x) __attribute__((always_inline)) x
-#endif
-#ifdef _MSC_VER
-/* microsoft c */
-#define ALWAYS_INLINE(x) __forceinline x
-#endif
-#ifndef ALWAYS_INLINE
-#define ALWAYS_INLINE(x) x
-#endif
-#endif /* ALWAYS_INLINE */
-
 /* macros depends on the compiler.
  *  LIKELY(x)      hint for the compiler that 'x' is 1(TRUE) in many cases.
  *  UNLIKELY(x)    hint for the compiler that 'x' is 0(FALSE) in many cases.
@@ -382,7 +300,7 @@ OCIEnv *oci8_make_envhp(void);
 extern oci8_tls_key_t oci8_tls_key; /* native thread key */
 OCIError *oci8_make_errhp(void);
 
-static inline OCIError *oci8_get_errhp()
+static inline OCIError *oci8_get_errhp(void)
 {
     OCIError *errhp = (OCIError *)oci8_tls_get(oci8_tls_key);
     return LIKELY(errhp != NULL) ? errhp : oci8_make_errhp();

data/ext/oci8/oci8lib.c

@@ -191,7 +191,7 @@ static void rebind_internal_symbols(void)
 __declspec(dllexport)
 #endif
 void
-Init_oci8lib()
+Init_oci8lib(void)
 {
     VALUE cOCI8;
     OCIEnv *envhp = NULL;

data/ext/oci8/ocihandle.c

@@ -217,7 +217,7 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
         }
         return rb_external_str_new_with_enc(v.charptr, size, oci8_encoding);
     case DATATYPE_BINARY:
-        return rb_tainted_str_new(v.charptr, size);
+        return rb_str_new(v.charptr, size);
     case DATATYPE_INTEGER:
         if (size > sizeof(onum.OCINumberPart) - 1) {
             rb_raise(rb_eRuntimeError, "Too long size %u", size);

data/ext/oci8/ocinumber.c

@@ -1795,6 +1795,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     id_BigDecimal = rb_intern("BigDecimal");
 
     cOCINumber = rb_define_class("OraNumber", rb_cNumeric);
+    rb_define_alloc_func(cOCINumber, onum_s_alloc);
     mMath = rb_define_module_under(cOCI8, "Math");
 
     /* constants for internal use. */
@@ -1844,8 +1845,6 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_module_function(mMath, "log10", omath_log10, 1);
     rb_define_module_function(mMath, "sqrt", omath_sqrt, 1);
 
-    rb_define_alloc_func(cOCINumber, onum_s_alloc);
-
     /* methods of OCI::Number */
     rb_define_global_function("OraNumber", onum_f_new, -1);
     rb_define_method(cOCINumber, "initialize", onum_initialize, -1);

data/lib/oci8/check_load_error.rb

@@ -4,7 +4,7 @@ class OCI8
   module Util
 
     case RUBY_PLATFORM
-    when /mswin32|cygwin|mingw32|bccwin32/
+    when /mswin32|cygwin|mingw/
 
       require 'fiddle/import'
       require 'fiddle/types'

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.10"
+  VERSION = "2.2.12"
 end

data/pre-distclean.rb

@@ -1,6 +1,4 @@
-rm_f "#{curr_objdir}/lib/oci8.rb"
-rm_f "#{curr_objdir}/ext/oci8/oci8lib_18.map"
-rm_f "#{curr_objdir}/ext/oci8/oci8lib_191.map"
+rm_f "#{curr_objdir}/ext/oci8/oci8lib_*.map"
 if RUBY_PLATFORM =~ /cygwin/
   rm_f "#{curr_objdir}/ext/oci8/OCI.def"
   rm_f "#{curr_objdir}/ext/oci8/libOCI.a"

data/test/test_object.rb

@@ -1,12 +1,6 @@
 require 'oci8'
 require File.dirname(__FILE__) + '/config'
 
-class Time
-  def inspect
-    self.strftime("%Y-%m-%d %H:%M:%S.%N %:z")
-  end
-end
-
 conn = OCI8.new($dbuser, $dbpass, $dbname)
 error_message = nil
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.12
 platform: ruby
 authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies: []
 description: 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
   with Oracle 10g or later including Oracle Instant Client.
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby interface for Oracle using OCI8 API