ruby-oci8 2.2.11 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fedff79278c31d88dee698417671fb84c334ad61d08595662fcef4c792742eb
-  data.tar.gz: 8af51646f9e6c4f96be8baaf15582b1e510f8655ed4c4f06cc45f0ab2599e8ea
+  metadata.gz: 1db88cf1bfe7291cc597bd695db32ea0e730734650c3bdfd40b9295663d0ac5e
+  data.tar.gz: 96f6b1b9fff2ba6067421d588495298cb14b5d42aa1fe7d4257c18431fdca654
 SHA512:
-  metadata.gz: f3efe23976439e355436b273d28778a1658d01c1d0c57809e3d992600efc98d0455f44936b711026d7eb4dc9599dda6477367edb49823d125a4cc6d2ef3f2349
-  data.tar.gz: 9ff212eccdc0e737f648aaab32f4958e47f5c551823d6d9613b89cf8f5195561980f5cc5c0d34c7a88e591c045b601ff779cb5a7b562ca26c0efbaa532e198f2
+  metadata.gz: da88c45ce3e73abb6cf30ad9633286204c3869a7b5e5f8e5acaeb90a824f7bb91d842c7da807e4639ff6993cf6d2bae96f9f5fe8cd64144f836eeca61c7fc85f
+  data.tar.gz: '088b13f4df8245aa95abdb2e2bf744c2088fa3fe87ffd5ffcdfedf0b43a724630d9a3603468269e6bf5790c4480d4e85a79a28af4db18bd05310b39c7dafed74'

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,30 @@
 # @markup markdown
 
+2.2.13 (2024-07-27)
+===================
+
+- Binary gems for Windows x64 and x86 supports ruby 2.7 - 3.3 inclusive.
+
+Fixed issues
+------------
+
+- Fix various issues about `OCI8.properties[:tcp_keepalive_time]` on macOS arm64. The feature was removed on the platform
+  and it raises `NotImplementedError` instead now.
+- Fix SIGSEGV when using truffleruby. It seems to be caused by `xfree()` outside of ruby threads.
+
+Changes
+-------
+
+- Change the format of fifth numeral of Oracle version number as two digit zero-padding number
+  when the Oracle version is 23 or upper. For example "23.4.0.24.05".
+
+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)
 ===================
 

data/docs/hanging-after-inactivity.md

@@ -39,7 +39,7 @@ by the `tcp_keepalive_time` property.
 It is supported on the following platforms since ruby-oci8 2.2.4.
 
 * Linux i386 and x86_64
-* macOS
+* macOS x86_64
 * Windows x86 and x64
 * Solaris x86_64
 

data/ext/oci8/extconf.rb

@@ -155,6 +155,7 @@ when /darwin/
 else
   plthook_src = "plthook_elf.c"
 end
+
 FileUtils.copy(File.dirname(__FILE__) + "/" + plthook_src, CONFTEST_C)
 if xsystem(cc_command(""))
   FileUtils.rm_f("#{CONFTEST}.#{$OBJEXT}")

data/ext/oci8/oci8.c

@@ -437,7 +437,7 @@ typedef struct {
 
 static void *complex_logoff_prepare(oci8_svcctx_t *svcctx)
 {
-    complex_logoff_arg_t *cla = xmalloc(sizeof(complex_logoff_arg_t));
+    complex_logoff_arg_t *cla = malloc(sizeof(complex_logoff_arg_t));
     cla->svchp = svcctx->base.hp.svc;
     cla->usrhp = svcctx->usrhp;
     cla->srvhp = svcctx->srvhp;
@@ -479,7 +479,7 @@ static void *complex_logoff_execute(void *arg)
     if (cla->svchp != NULL) {
         OCIHandleFree(cla->svchp, OCI_HTYPE_SVCCTX);
     }
-    xfree(cla);
+    free(cla);
     return (void*)(VALUE)rv;
 }
 

data/ext/oci8/oci8.h

@@ -29,11 +29,12 @@ extern "C"
  * hexadecimal ->  dotted version number    hexadecimal ->  dotted version number
  *  0c102304   ->  12.1.2.3.4                12012034   ->  18.1.2.3.4
  *                 ^  ^ ^ ^ ^                               ^  ^ ^ ^ ^
- *  0c ------------'  | | | |  2 bytes       12 ------------'  | | | |  2 bytes
- *    1 --------------' | | |  1 byte          01 -------------' | | |  2 bytes
- *     02 --------------' | |  2 bytes           2 --------------' | |  1 byte
- *       3 ---------------' |  1 byte             03 --------------' |  2 bytes
- *        04 ---------------'  2 bytes              4 ---------------'  1 byte
+ *  0c ------------'  | | | |  8 bits        12 ------------'  | | | |  8 bits
+ *    1 --------------' | | |  4 bits          01 -------------' | | |  8 bits
+ *     02 --------------' | |  8 bits            2 --------------' | |  4 bits
+ *       3 ---------------' |  4 bits             03 --------------' |  8 bits
+ *        04 ---------------'  8 bits               4 ---------------'  4 bits
+ *                      total 32 bits                            total 32 bits
  */
 #define ORAVERNUM(major, minor, update, patch, port_update) \
     (((major) >= 18) ? (((major) << 24) | ((minor) << 16) | ((update) << 12) | ((patch) << 4) | (port_update)) \
@@ -89,88 +90,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 +301,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;
@@ -675,28 +675,7 @@ void *oci8_find_symbol(const char *symbol_name)
 
 void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type, int error_if_closed)
 {
-#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
     oci8_base_t *hp = Check_TypedStruct(obj, &data_type->rb_data_type);
-#else
-    oci8_base_t *hp;
-    const char *expected_type_name = data_type->rb_data_type.wrap_struct_name;
-    const rb_data_type_t *rb_data_type;
-    const rb_data_type_t *expected_rb_data_type = &data_type->rb_data_type;
-
-    if (TYPE(obj) != T_DATA || !rb_obj_is_kind_of(obj, oci8_cOCIHandle)) {
-        rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                 rb_obj_classname(obj), expected_type_name);
-    }
-    hp = DATA_PTR(obj);
-    rb_data_type = &hp->data_type->rb_data_type;
-    while (rb_data_type != expected_rb_data_type) {
-        if (rb_data_type == NULL) {
-            rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                     rb_obj_classname(obj), expected_type_name);
-        }
-        rb_data_type = rb_data_type->parent;
-    }
-#endif
     if (error_if_closed && hp->closed) {
         rb_raise(eOCIException, "%s was already closed.",
                  rb_obj_classname(obj));

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/ext/oci8/oraconf.rb

@@ -130,6 +130,8 @@ class MiniSOReader
       @cpu = :ia64
     when 62
       @cpu = :x86_64
+    when 183
+      @cpu = :aarch64
     else
       raise "Invalid ELF archtype: #{archtype}"
     end
@@ -379,6 +381,8 @@ EOS
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
       check_proc = make_proc_to_check_cpu(is_32bit ? :i386 : :x86_64)
+    when /aarch64-linux/
+      check_proc = make_proc_to_check_cpu(:aarch64)
     when /i.86-linux/
       check_proc = make_proc_to_check_cpu(:i386)
     when /ia64-linux/

data/ext/oci8/oradate.c

@@ -61,18 +61,7 @@ typedef struct ora_date ora_date_t;
     if (sec < 0 || 59 < sec) \
         rb_raise(rb_eRangeError, "Out of range for second %d (expect 0 .. 59)", sec)
 
-#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 #define check_oradate(obj) ((ora_date_t*)Check_TypedStruct((obj), &odate_data_type))
-#else
-static ora_date_t *check_oradate(VALUE obj)
-{
-    if (!rb_obj_is_kind_of(obj, cOraDate)) {
-        rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                 rb_obj_classname(obj), rb_class2name(cOraDate));
-    }
-    return DATA_PTR(obj);
-}
-#endif
 
 static size_t odate_memsize(const void *ptr)
 {