ruby-oci8 2.2.3 → 2.2.12

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);
@@ -245,9 +245,9 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
  *
  *  Gets the value of an attribute as `ub1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -262,9 +262,9 @@ static VALUE attr_get_ub1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -279,7 +279,7 @@ static VALUE attr_get_ub2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -296,7 +296,7 @@ static VALUE attr_get_ub4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -313,9 +313,9 @@ static VALUE attr_get_ub8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -330,9 +330,9 @@ static VALUE attr_get_sb1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -347,7 +347,7 @@ static VALUE attr_get_sb2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -364,7 +364,7 @@ static VALUE attr_get_sb4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -381,7 +381,7 @@ static VALUE attr_get_sb8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `boolean' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [true of false]
  *
@@ -403,7 +403,7 @@ static VALUE attr_get_boolean(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -424,7 +424,7 @@ static VALUE attr_get_string(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -445,9 +445,9 @@ static VALUE attr_get_binary(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -466,7 +466,7 @@ static VALUE attr_get_integer(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [OraDate]
  *
@@ -486,8 +486,8 @@ static VALUE attr_get_oradate(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -514,8 +514,8 @@ static VALUE attr_set_ub1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -542,7 +542,7 @@ static VALUE attr_set_ub2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -570,7 +570,7 @@ static VALUE attr_set_ub4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -598,8 +598,8 @@ static VALUE attr_set_ub8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -626,8 +626,8 @@ static VALUE attr_set_sb1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *   pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -654,7 +654,7 @@ static VALUE attr_set_sb2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -682,7 +682,7 @@ static VALUE attr_set_sb4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -710,7 +710,7 @@ static VALUE attr_set_sb8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [true or false] attr_value
  *  @return [self]
  *
@@ -737,7 +737,7 @@ static VALUE attr_set_boolean(VALUE self, VALUE attr_type, VALUE val)
  *  +attr_value+ is converted to {OCI8.encoding} before it is set
  *  when the ruby version is 1.9.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @return [self]
  *
@@ -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;
 }
 
@@ -761,7 +761,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
  *
  *  Sets the value of an attribute as `ub1 *' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @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;
 }
 
@@ -787,7 +787,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
  *  +number+ is converted to internal Oracle NUMBER format before
  *  it is set.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Numeric] number
  *  @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;
@@ -1793,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. */
@@ -1842,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);
@@ -1873,7 +1874,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 +1903,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);
 }
 
 /*