ruby-oci8 2.0.4 → 2.0.5

data/ext/oci8/oradate.c

@@ -3,7 +3,7 @@
  *  oradate.c
  *
  * $Author: kubo $
- * $Date: 2009-01-04 01:58:01 +0900 (Sun, 04 Jan 2009) $
+ * $Date: 2010-09-05 22:07:21 +0900 (日, 05  9月 2010) $
  *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  *
@@ -146,7 +146,7 @@ static VALUE ora_date_initialize_copy(VALUE lhs, VALUE rhs)
 {
     ora_date_t *l, *r;
 
-    rb_obj_init_copy(lhs, rhs);
+    rb_call_super(1, &rhs);
     Data_Get_Struct(lhs, ora_date_t, l);
     Data_Get_Struct(rhs, ora_date_t, r);
     memcpy(l, r, sizeof(ora_date_t));

data/ext/oci8/oranumber_util.c

@@ -37,9 +37,24 @@ int oranumber_to_str(const OCINumber *on, char *buf, int buflen)
             PUTEND();
             return 1;
         }
+        if (on->OCINumberPart[1] == 0) {
+            /* negative infinity */
+            PUTC('-');
+            PUTC('~');
+            PUTEND();
+            return 2;
+        }
         /* unexpected format */
         return -1;
     }
+    if (datalen == 2) {
+        if (on->OCINumberPart[1] == 255 && on->OCINumberPart[2] == 101) {
+            /* positive infinity */
+            PUTC('~');
+            PUTEND();
+            return 1;
+        }
+    }
     if (datalen > 21) {
         /* too long */
         return -1;
@@ -137,6 +152,28 @@ int oranumber_from_str(OCINumber *on, const char *buf, int buflen)
         buf++;
         is_positive = 0;
     }
+    if (*buf == '~') {
+        buf ++;
+        /* skip trailing spaces */
+        while (buf < end && *buf == ' ') {
+            buf++;
+        }
+        if (buf != end) {
+            return ORANUMBER_INVALID_NUMBER;
+        }
+        if (is_positive) {
+            /* positive infinity */
+            on->OCINumberPart[0] = 2;
+            on->OCINumberPart[1] = 255;
+            on->OCINumberPart[2] = 101;
+        } else {
+            /* negative infinity */
+            on->OCINumberPart[0] = 1;
+            on->OCINumberPart[1] = 0;
+        }
+        return ORANUMBER_SUCCESS;
+    }
+
     /* next should be number or a dot */
     if ((*buf < '0' || '9' < *buf) && *buf != '.') {
         return ORANUMBER_INVALID_NUMBER;
@@ -308,7 +345,7 @@ int oranumber_dump(const OCINumber *on, char *buf)
         len = 21;
     }
     for (idx = 1; idx <= len; idx++) {
-        offset += sprintf(buf + offset, "%hhu,", on->OCINumberPart[idx]);
+        offset += sprintf(buf + offset, "%u,", (ub4)on->OCINumberPart[idx]);
     }
     buf[--offset] = '\0';
     return offset;

data/ext/oci8/stmt.c

@@ -3,7 +3,7 @@
  * stmt.c - part of ruby-oci8
  *         implement the methods of OCIStmt.
  *
- * Copyright (C) 2002-2007 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2010 KUBO Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -28,6 +28,8 @@ static ID id_clear;
 
 VALUE cOCIStmt;
 
+#define TO_STMT(obj) ((oci8_stmt_t *)oci8_get_handle((obj), cOCIStmt))
+
 typedef struct {
     oci8_base_t base;
     VALUE svc;
@@ -94,7 +96,7 @@ static VALUE oci8_stmt_initialize(int argc, VALUE *argv, VALUE self)
 
 static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     ub4 position;
     oci8_bind_t *obind;
     const oci8_bind_class_t *bind_class;
@@ -117,6 +119,10 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
         oci8_raise(oci8_errhp, status, stmt->base.hp.ptr);
     }
     obind->base.type = OCI_HTYPE_DEFINE;
+    /* link to the parent as soon as possible to preserve deallocation order. */
+    oci8_unlink_from_parent((oci8_base_t*)obind);
+    oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
+
     if (NIL_P(obind->tdo) && obind->maxar_sz > 0) {
         oci_lc(OCIDefineArrayOfStruct(obind->base.hp.dfn, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0));
     }
@@ -135,14 +141,12 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
         oci_lc(OCIAttrSet(obind->base.hp.ptr, OCI_HTYPE_DEFINE, (void*)&bind_class->csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp));
     }
     rb_ary_store(stmt->defns, position - 1, obind->base.self);
-    oci8_unlink_from_parent((oci8_base_t*)obind);
-    oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
     return obind->base.self;
 }
 
 static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     char *placeholder_ptr = (char*)-1; /* initialize as an invalid value */
     ub4 placeholder_len = 0;
     ub4 position = 0;
@@ -197,6 +201,10 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
         oci8_raise(oci8_errhp, status, stmt->base.hp.stmt);
     }
     obind->base.type = OCI_HTYPE_BIND;
+    /* link to the parent as soon as possible to preserve deallocation order. */
+    oci8_unlink_from_parent((oci8_base_t*)obind);
+    oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
+
     if (NIL_P(obind->tdo) && obind->maxar_sz > 0) {
         oci_lc(OCIBindArrayOfStruct(obind->base.hp.bnd, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0));
     }
@@ -213,8 +221,6 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
         oci8_base_free((oci8_base_t*)oci8_get_bind(old_value));
     }
     rb_hash_aset(stmt->binds, vplaceholder, obind->base.self);
-    oci8_unlink_from_parent((oci8_base_t*)obind);
-    oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
     return obind->base.self;
 }
 
@@ -237,7 +243,7 @@ static sword oci8_call_stmt_execute(oci8_svcctx_t *svcctx, oci8_stmt_t *stmt, ub
 
 static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(stmt->svc);
     ub4 iters;
     ub4 mode;
@@ -323,8 +329,8 @@ static VALUE clear_binds_iterator_proc(VALUE val, VALUE arg)
 
 static VALUE oci8_stmt_clear_binds(VALUE self)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
-    
+    oci8_stmt_t *stmt = TO_STMT(self);
+
     if(!RTEST(rb_funcall(stmt->binds, id_empty_p, 0)))
     {
         rb_iterate(each_value, stmt->binds, clear_binds_iterator_proc, Qnil);
@@ -449,7 +455,7 @@ static VALUE oci8_stmt_do_fetch(oci8_stmt_t *stmt, oci8_svcctx_t *svcctx)
  */
 static VALUE oci8_stmt_fetch(VALUE self)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(stmt->svc);
 
     if (rb_block_given_p()) {
@@ -466,7 +472,7 @@ static VALUE oci8_stmt_fetch(VALUE self)
 
 static VALUE oci8_stmt_get_param(VALUE self, VALUE pos)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     OCIParam *parmhp = NULL;
     sword rv;
 
@@ -498,7 +504,7 @@ static VALUE oci8_stmt_get_param(VALUE self, VALUE pos)
  */
 static VALUE oci8_stmt_get_stmt_type(VALUE self)
 {
-    VALUE stmt_type = oci8_get_ub2_attr(DATA_PTR(self), OCI_ATTR_STMT_TYPE);
+    VALUE stmt_type = oci8_get_ub2_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_STMT_TYPE);
     switch (FIX2INT(stmt_type)) {
     case OCI_STMT_SELECT:
         return oci8_sym_select_stmt;
@@ -528,7 +534,7 @@ static VALUE oci8_stmt_get_stmt_type(VALUE self)
  */
 static VALUE oci8_stmt_get_row_count(VALUE self)
 {
-    return oci8_get_ub4_attr(DATA_PTR(self), OCI_ATTR_ROW_COUNT);
+    return oci8_get_ub4_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_ROW_COUNT);
 }
 
 /*
@@ -547,12 +553,12 @@ static VALUE oci8_stmt_get_row_count(VALUE self)
  */
 static VALUE oci8_stmt_get_rowid(VALUE self)
 {
-    return oci8_get_rowid_attr(DATA_PTR(self), OCI_ATTR_ROWID);
+    return oci8_get_rowid_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_ROWID);
 }
 
 static VALUE oci8_stmt_get_param_count(VALUE self)
 {
-    return oci8_get_ub4_attr(DATA_PTR(self), OCI_ATTR_PARAM_COUNT);
+    return oci8_get_ub4_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_PARAM_COUNT);
 }
 
 /*
@@ -595,7 +601,7 @@ static VALUE oci8_stmt_get_param_count(VALUE self)
  */
 static VALUE oci8_stmt_aref(VALUE self, VALUE key)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     VALUE obj = rb_hash_aref(stmt->binds, key);
     if (NIL_P(obj)) {
         return Qnil;
@@ -633,7 +639,7 @@ static VALUE oci8_stmt_aset(VALUE self, VALUE key, VALUE val)
     long actual_array_size;
     long bind_array_size;
 
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     VALUE obj = rb_hash_aref(stmt->binds, key);
     if (NIL_P(obj)) {
         return Qnil; /* ?? MUST BE ERROR? */
@@ -650,7 +656,7 @@ static VALUE oci8_stmt_aset(VALUE self, VALUE key, VALUE val)
         if(bind_array_size <= max_array_size && actual_array_size == 0) {
             rb_ivar_set(self, id_at_actual_array_size, INT2NUM(bind_array_size));
         }
-    }     
+    }
     oci8_bind_set_data(obj, val);
     return val;
 }
@@ -663,13 +669,13 @@ static VALUE oci8_stmt_aset(VALUE self, VALUE key, VALUE val)
  */
 static VALUE oci8_stmt_keys(VALUE self)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     return rb_funcall(stmt->binds, oci8_id_keys, 0);
 }
 
 static VALUE oci8_stmt_defined_p(VALUE self, VALUE pos)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     long position = NUM2INT(pos);
 
     if (position - 1 < RARRAY_LEN(stmt->defns)) {
@@ -693,7 +699,7 @@ static VALUE oci8_stmt_defined_p(VALUE self, VALUE pos)
  */
 static VALUE oci8_stmt_set_prefetch_rows(VALUE self, VALUE rows)
 {
-    oci8_stmt_t *stmt = DATA_PTR(self);
+    oci8_stmt_t *stmt = TO_STMT(self);
     ub4 num = NUM2UINT(rows);
 
     oci_lc(OCIAttrSet(stmt->base.hp.ptr, OCI_HTYPE_STMT, &num, 0, OCI_ATTR_PREFETCH_ROWS, oci8_errhp));

data/ext/oci8/win32.c

@@ -2,9 +2,15 @@
 /*
   win32.c - part of ruby-oci8
 
-  Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+  Copyright (C) 2009-2010 KUBO Takehiro <kubo@jiubao.org>
 */
 #include "oci8.h"
+#ifdef __CYGWIN__
+/* boolean is defined as a macro in oratypes.h.
+ * It conflicts with the definition in windows.h.
+ */
+#undef boolean
+#endif
 #include <windows.h>
 
 NORETURN(static void raise_error(void));
@@ -84,14 +90,14 @@ static VALUE enum_homes_real(enum_homes_arg_t *arg)
         }
         /* Get ORACLE_HOME */
         name_len = sizeof(name);
-        rv = RegQueryValueEx(arg->hSubKey, "ORACLE_HOME", NULL, &type, name, &name_len);
+        rv = RegQueryValueEx(arg->hSubKey, "ORACLE_HOME", NULL, &type, TO_ORATEXT(name), &name_len);
         if (rv != ERROR_SUCCESS || type != REG_SZ) {
             continue;
         }
         oracle_home = rb_locale_str_new_cstr(name);
         /* Get NLS_LANG */
         name_len = sizeof(name);
-        rv = RegQueryValueEx(arg->hSubKey, "NLS_LANG", NULL, &type, name, &name_len);
+        rv = RegQueryValueEx(arg->hSubKey, "NLS_LANG", NULL, &type, TO_ORATEXT(name), &name_len);
         if (rv != ERROR_SUCCESS || type != REG_SZ) {
             continue;
         }

data/lib/oci8.rb.in

@@ -18,14 +18,24 @@ if RUBY_PLATFORM =~ /cygwin/
   end
 end
 
+so_basename = 'oci8lib_'
+if defined? RUBY_ENGINE and RUBY_ENGINE != 'ruby'
+  so_basename += RUBY_ENGINE
+end
+
+# The suffix number indicates the ruby API version.
+#  18  - ruby 1.8.x
+#  191 - ruby 1.9.1 and 1.9.2
+#  19x - ruby 1.9.x future version which will break the API compatibility
 case RUBY_VERSION
 when /^1\.9/
-  require 'oci8lib_191'
+  so_basename += '191'
 when /^1\.8/
-  require 'oci8lib_18'
+  so_basename += '18'
 else
   raise 'unsupported ruby version: ' + RUBY_VERSION
 end
+require so_basename
 
 if OCI8.respond_to? :encoding
   if defined? DEFAULT_OCI8_ENCODING
@@ -75,6 +85,7 @@ require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
+require 'oci8/properties.rb'
 
 class OCI8
   VERSION = '@@OCI8_MODULE_VERSION@@'

data/lib/oci8/.document

@@ -3,3 +3,4 @@ object.rb
 metadata.rb
 oracle_version.rb
 oci8.rb
+properties.rb

data/lib/oci8/bindtype.rb

@@ -1,7 +1,7 @@
 #--
 # bindtype.rb -- OCI8::BindType
 #
-# Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2009-2010 KUBO Takehiro <kubo@jiubao.org>
 #++
 
 class OCI8
@@ -46,6 +46,12 @@ class OCI8
       end
     end
 
+    class BasicNumberType < OCI8::BindType::OraNumber
+      def get()
+        (val = super()) && (val.has_decimal_part? ? val.to_f : val.to_i)
+      end
+    end
+
     # get/set Number (for OCI8::SQLT_NUM)
     class Number
       def self.create(con, val, param, max_array_size)
@@ -116,6 +122,8 @@ class OCI8
               length = val.size
             end
           end
+          # use the default value when :nchar is not set explicitly.
+          nchar = OCI8.properties[:bind_string_as_nchar] unless param.has_key?(:nchar)
         when OCI8::Metadata::Base
           case param.data_type
           when :char, :varchar2
@@ -124,13 +132,18 @@ class OCI8
             # The length of a Japanese half-width kana is one in Shift_JIS,
             # two in EUC-JP, three in UTF-8.
             length *= 3 unless param.char_used?
+            nchar = (param.charset_form == :nchar)
           when :raw
             # HEX needs twice space.
             length = param.data_size * 2
           end
         end
         length = @@minimum_bind_length if length.nil? or length < @@minimum_bind_length
-        self.new(con, val, length, max_array_size)
+        if nchar
+          OCI8::BindType::NCHAR.new(con, val, length, max_array_size)
+        else
+          OCI8::BindType::CHAR.new(con, val, length, max_array_size)
+        end
       end
     end
 
@@ -153,7 +166,7 @@ class OCI8
 
     class Long < OCI8::BindType::String
       def self.create(con, val, param, max_array_size)
-        self.new(con, val, con.long_read_len, max_array_size)
+        super(con, val, {:length => con.long_read_len}, max_array_size)
       end
     end
 

data/lib/oci8/datetime.rb

@@ -38,6 +38,14 @@ class OCI8
         @@time_new_accepts_timezone = false # prior to ruby 1.9.2
       end
 
+      begin
+        # 2001-01-01 00:00:59.999
+        ::DateTime.civil(2001, 1, 1, 0, 0, Rational(59_999, 1000), 0)
+        @@datetime_has_fractional_second_bug = false
+      rescue ArgumentError
+        @@datetime_has_fractional_second_bug = true
+      end
+
       def self.default_timezone
         @@default_timezone
       end
@@ -162,8 +170,8 @@ class OCI8
           return nil if ary.nil?
 
           year, month, day, hour, minute, sec, fsec, tz_hour, tz_min = ary
-          if sec >= 59 and fsec != 0
-            # convert to a DateTime via a String as a last resort.
+          if @@datetime_has_fractional_second_bug and sec >= 59 and fsec != 0
+            # convert to a DateTime via a String as a workaround
             if tz_hour >= 0 && tz_min >= 0
               sign = ?+
             else
@@ -245,7 +253,7 @@ class OCI8
     end
 
     if OCI8.oracle_client_version >= ORAVER_9_0
-      class DateTimeViaOCITimestamp < OCI8::BindType::OCITimestamp # :nodoc:
+      class DateTimeViaOCITimestampTZ < OCI8::BindType::OCITimestampTZ # :nodoc:
         include OCI8::BindType::Util
 
         def set(val) # :nodoc:
@@ -257,7 +265,7 @@ class OCI8
         end
       end
 
-      class TimeViaOCITimestamp < OCI8::BindType::OCITimestamp # :nodoc:
+      class TimeViaOCITimestampTZ < OCI8::BindType::OCITimestampTZ # :nodoc:
         include OCI8::BindType::Util
 
         def set(val) # :nodoc:
@@ -335,7 +343,7 @@ class OCI8
       if OCI8.oracle_client_version >= ORAVER_9_0
         def self.create(con, val, param, max_array_size) # :nodoc:
           if true # TODO: check Oracle server version
-            DateTimeViaOCITimestamp.new(con, val, param, max_array_size)
+            DateTimeViaOCITimestampTZ.new(con, val, param, max_array_size)
           else
             DateTimeViaOCIDate.new(con, val, param, max_array_size)
           end
@@ -414,7 +422,7 @@ class OCI8
       if OCI8.oracle_client_version >= ORAVER_9_0
         def self.create(con, val, param, max_array_size) # :nodoc:
           if true # TODO: check Oracle server version
-            TimeViaOCITimestamp.new(con, val, param, max_array_size)
+            TimeViaOCITimestampTZ.new(con, val, param, max_array_size)
           else
             TimeViaOCIDate.new(con, val, param, max_array_size)
           end