ruby-oci8 2.2.4.1 → 2.2.11

data/ext/oci8/oci8lib.c

@@ -71,7 +71,7 @@ static VALUE bind_base_alloc(VALUE klass)
     rb_raise(rb_eNameError, "private method `new' called for %s:Class", rb_class2name(klass));
 }
 
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
 static const char *find_libclntsh(void *handle)
 {
     void *symaddr = dlsym(handle, "OCIEnvCreate");
@@ -226,7 +226,7 @@ Init_oci8lib()
         oracle_client_version = ORAVERNUM(major, minor, update, patch, port_update);
     }
 #endif
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
     rebind_internal_symbols();
 #endif
 
@@ -461,6 +461,7 @@ sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *
         parg.func = func;
         parg.data = data;
         rv = (sword)rb_protect(protected_call, (VALUE)&parg, &state);
+        RB_OBJ_WRITE(svcctx->base.self, &svcctx->executing_thread, Qnil);
         if (state) {
             rb_jump_tag(state);
         }
@@ -481,8 +482,8 @@ typedef struct {
     OCIStmt *stmtp;
 } cb_arg_t;
 
-static VALUE exec_sql(cb_arg_t *arg);
-static VALUE ensure_func(cb_arg_t *arg);
+static VALUE exec_sql(VALUE varg);
+static VALUE ensure_func(VALUE varg);
 
 /*
  * utility function to execute a single SQL statement
@@ -503,13 +504,14 @@ sword oci8_exec_sql(oci8_svcctx_t *svcctx, const char *sql_text, ub4 num_define_
     return (sword)rb_ensure(exec_sql, (VALUE)&arg, ensure_func, (VALUE)&arg);
 }
 
-static VALUE exec_sql(cb_arg_t *arg)
+static VALUE exec_sql(VALUE varg)
 {
+    cb_arg_t *arg = (cb_arg_t *)varg;
     ub4 pos;
     sword rv;
 
     chker2(OCIStmtPrepare2(arg->svcctx->base.hp.svc, &arg->stmtp, oci8_errhp, 
-                           (text*)arg->sql_text, strlen(arg->sql_text), NULL, 0,
+                           (text*)arg->sql_text, (ub4)strlen(arg->sql_text), NULL, 0,
                            OCI_NTV_SYNTAX, OCI_DEFAULT),
            &arg->svcctx->base);
     for (pos = 0; pos < arg->num_define_vars; pos++) {
@@ -546,8 +548,9 @@ static VALUE exec_sql(cb_arg_t *arg)
     return (VALUE)rv;
 }
 
-static VALUE ensure_func(cb_arg_t *arg)
+static VALUE ensure_func(VALUE varg)
 {
+    cb_arg_t *arg = (cb_arg_t *)varg;
     if (arg->stmtp != NULL) {
         OCIStmtRelease(arg->stmtp, oci8_errhp, NULL, 0, OCI_DEFAULT);
     }
@@ -558,6 +561,24 @@ static VALUE ensure_func(cb_arg_t *arg)
 
 #ifndef _WIN32
 #include <dlfcn.h>
+static void *load_file(const char *filename, int flags, VALUE errors)
+{
+    void *handle = dlopen(filename, flags);
+
+    if (handle == NULL) {
+        char *err = dlerror();
+        VALUE msg;
+
+        if (strstr(err, filename) == NULL) {
+            msg = rb_sprintf("%s: %s", filename, err);
+            msg = rb_enc_associate_index(msg, rb_locale_encindex());
+        } else {
+            msg = rb_locale_str_new_cstr(err);
+        }
+        rb_ary_push(errors, msg);
+    }
+    return handle;
+}
 #endif
 
 void *oci8_find_symbol(const char *symbol_name)
@@ -600,58 +621,50 @@ void *oci8_find_symbol(const char *symbol_name)
             "libclntsh.sl.12.1",
             "libclntsh.sl.11.1",
             "libclntsh.sl.10.1",
-            "libclntsh.sl.9.0",
-            "libclntsh.sl.8.0",
 #elif defined(__APPLE__)
             /* Mac OS X */
+            "libclntsh.dylib",
             "libclntsh.dylib.12.1",
             "libclntsh.dylib.11.1",
             "libclntsh.dylib.10.1",
 #else
             /* Linux, Solaris and HP-UX(IA64) */
+            "libclntsh.so",
             "libclntsh.so.12.1",
             "libclntsh.so.11.1",
             "libclntsh.so.10.1",
-            "libclntsh.so.9.0",
-            "libclntsh.so.8.0",
 #endif
         };
 #define NUM_SONAMES (sizeof(sonames)/sizeof(sonames[0]))
+#if defined(_AIX) /* AIX */
+#define BASE_SONAME "libclntsh.a(shr.o)"
+#elif defined(__hppa) /* HP-UX(PA-RISC) */
+#define BASE_SONAME "libclntsh.sl"
+#elif !defined(__CYGWIN__) && !defined(__APPLE__)
+#define BASE_SONAME "libclntsh.so"
+#endif
         size_t idx;
-        volatile VALUE err = rb_ary_new();
+        VALUE err = rb_ary_new();
 
 #ifdef _AIX
 #define DLOPEN_FLAG (RTLD_LAZY|RTLD_GLOBAL|RTLD_MEMBER)
 #else
 #define DLOPEN_FLAG (RTLD_LAZY|RTLD_GLOBAL)
 #endif
-        for (idx = 0; idx < NUM_SONAMES; idx++) {
-            handle = dlopen(sonames[idx], DLOPEN_FLAG);
-            if (handle != NULL) {
-                break;
-            }
-            rb_ary_push(err, rb_locale_str_new_cstr(dlerror()));
+#ifdef BASE_SONAME
+        char *oracle_home = getenv("ORACLE_HOME");
+
+        if (oracle_home != NULL) {
+            VALUE fname = rb_str_buf_cat2(rb_str_buf_new_cstr(oracle_home),  "/lib/" BASE_SONAME);
+            handle = load_file(StringValueCStr(fname), DLOPEN_FLAG, err);
+            RB_GC_GUARD(fname);
+        }
+#endif
+        for (idx = 0; handle == NULL && idx < NUM_SONAMES; idx++) {
+            handle = load_file(sonames[idx], DLOPEN_FLAG, err);
         }
         if (handle == NULL) {
-            VALUE msg;
-            const VALUE *arr = RARRAY_CONST_PTR(err);
-
-            msg = rb_str_buf_new(NUM_SONAMES * 50);
-            for (idx = 0; idx < NUM_SONAMES; idx++) {
-                const char *errmsg = RSTRING_PTR(arr[idx]);
-                if (idx != 0) {
-                    rb_str_buf_cat2(msg, " ");
-                }
-                if (strstr(errmsg, sonames[idx]) == NULL) {
-                    /* prepend "soname: " if soname is not found in
-                     * the error message.
-                     */
-                    rb_str_buf_cat2(msg, sonames[idx]);
-                    rb_str_buf_cat2(msg, ": ");
-                }
-                rb_str_buf_append(msg, arr[idx]);
-                rb_str_buf_cat2(msg, ";");
-            }
+            VALUE msg = rb_ary_join(err, rb_usascii_str_new_cstr("; "));
             rb_exc_raise(rb_exc_new3(rb_eLoadError, msg));
         }
     }

data/ext/oci8/ocihandle.c

@@ -752,7 +752,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     OCI8SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -776,7 +776,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 

data/ext/oci8/ocinumber.c

@@ -154,7 +154,7 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     StringValue(str);
     /* set from string. */
     if (NIL_P(fmt)) {
-        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv == ORANUMBER_SUCCESS) {
             return; /* success */
         } else {
@@ -172,17 +172,17 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     chkerr(OCINumberFromText(errhp,
-                             RSTRING_ORATEXT(str), RSTRING_LEN(str),
+                             RSTRING_ORATEXT(str), RSTRING_LENINT(str),
                              fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
                              result));
 }
@@ -216,6 +216,8 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
         num = rb_big2str(num, 10);
         set_oci_number_from_str(result, num, Qnil, Qnil, errhp);
         return 1;
+    default:
+        break;
     }
     if (RTEST(rb_obj_is_instance_of(num, cOCINumber))) {
         /* OCI::Number */
@@ -247,7 +249,7 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
             if (TYPE(ary[1]) != T_STRING) {
                 goto is_not_big_decimal;
             }
-            digits_len = RSTRING_LEN(ary[1]);
+            digits_len = RSTRING_LENINT(ary[1]);
             set_oci_number_from_str(&digits, ary[1], Qnil, Qnil, errhp);
             /* check base */
             if (TYPE(ary[2]) != T_FIXNUM || FIX2LONG(ary[2]) != 10) {
@@ -363,7 +365,7 @@ OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp)
         sword rv;
 
         str = rb_obj_as_string(rb_float_new(dbl));
-        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv != 0) {
             oci8_raise_by_msgno(rv, NULL);
         }
@@ -1307,14 +1309,14 @@ static VALUE onum_to_char(int argc, VALUE *argv, VALUE self)
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     rv = OCINumberToText(errhp, _NUMBER(self),
                          fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
@@ -1435,23 +1437,23 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
         rb_require("bigdecimal");
         cBigDecimal = rb_const_get(rb_cObject, id_BigDecimal);
     }
-    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
+    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, (ub4)strlen(fmt),
                            NULL, 0, &buf_size, TO_ORATEXT(buf)));
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }
 
 /*
- * @overload has_decimal_part?
+ * @overload has_fractional_part?
  *
- *  Returns <code>true</code> if <i>self</i> has a decimal part.
+ *  Returns <code>true</code> if <i>self</i> has a fractional part.
  *
  *  @example
- *    OraNumber(10).has_decimal_part?   # => false
- *    OraNumber(10.1).has_decimal_part? # => true
+ *    OraNumber(10).has_fractional_part?   # => false
+ *    OraNumber(10.1).has_fractional_part? # => true
  *
- *  @since 2.0.5
+ *  @since 2.2.5
  */
-static VALUE onum_has_decimal_part_p(VALUE self)
+static VALUE onum_has_fractional_part_p(VALUE self)
 {
     OCIError *errhp = oci8_errhp;
     boolean result;
@@ -1873,7 +1875,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_method(cOCINumber, "to_f", onum_to_f, 0);
     rb_define_method(cOCINumber, "to_r", onum_to_r, 0);
     rb_define_method(cOCINumber, "to_d", onum_to_d, 0);
-    rb_define_method(cOCINumber, "has_decimal_part?", onum_has_decimal_part_p, 0);
+    rb_define_method(cOCINumber, "has_fractional_part?", onum_has_fractional_part_p, 0);
     rb_define_method(cOCINumber, "to_onum", onum_to_onum, 0);
 
     rb_define_method(cOCINumber, "zero?", onum_zero_p, 0);
@@ -1902,6 +1904,10 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     dummy2 = rb_define_class_under(mOCI8BindType, "Integer", cOCI8BindTypeBase);
     dummy3 = rb_define_class_under(mOCI8BindType, "Float", cOCI8BindTypeBase);
 #endif
+
+    /* The following method definition is for backward-compatibility.
+       I misunderstood the name of numbers after a decimal point. */
+    rb_define_method_nodoc(cOCINumber, "has_decimal_part?", onum_has_fractional_part_p, 0);
 }
 
 /*