ruby-oci8 2.0.0 → 2.0.1

data/ChangeLog

@@ -1,3 +1,45 @@
+2009-03-17  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add a new file.
+	* VERSION: change version to 2.0.1.
+	* Makefile: add targets to make a binary gem for Windows.
+	* dist-files: add NEWS
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: rename oci8lib.so
+	    to oci8lib_18.so and oci8lib_191.so. The renamed name
+	    depends on the ruby version.
+	* lib/oci8/datetime.rb: fix the fetched type for date column
+	    when using Oracle 8.x.
+	* ruby-oci8.gemspec: fix to make a binary gem which contains
+	    both oci8lib_18.so and oci8lib_191.so.
+
+2009-03-17  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml: add prototypes for OCIServerVersion() and
+	    OCIServerRelease().
+	* ext/oci8/oci8.c: (1) add a private method OCI8#oracle_server_vernum,
+	    which returns Oracle server version number.
+	    (2) fix a class method OCI8.oracle_client_vernum when using Oracle
+	    client 10.1 or lower.
+	* lib/oci8/datetime.rb: fix year information when fetching a date
+	    whose year is between A.D. 1 and A.D. 139.
+	* lib/oci8/oci8.rb: (1) add OCI8#oracle_server_version.
+	*   (2) change the default data type for timestamp with time zone
+	    from DateTime to Time.
+
+2009-03-11  KUBO Takehiro  <kubo@jiubao.org>
+	* oraconf.rb: fix big/little endian checking problem on Mac OS X ppc.
+	    (contributed by unknown. See: Bug ID 24284 on rubyforge.)
+
+2009-02-15  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocidatetime.c: fix array DML and DateTime object problem.
+	    OCI8::Cursor#bind_param_array(key, array_of_datetime) didn't
+	    work. (Reported by Leoš Bitto)
+	* test/test_array_dml.rb: fix to test array DML and DateTime object.
+
+2009-02-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/bind.c, ext/oci8/oci8.h, ext/oci8/stmt.c: fix array DML
+	    and DateTime object problem. It didn't work with bind classes
+	    which overwrite 'set' and 'get'. (Reported by Leoš Bitto)
+	* test/test_array_dml.rb: fix to test array DML and DateTime object.
+
 2009-02-08  KUBO Takehiro  <kubo@jiubao.org>
 	* VERSION: change version from 2.0-svn to 2.0.0 to pass ruby
 	    gem's version string validator.

data/Makefile

@@ -46,3 +46,42 @@ dist-check: dist
 	cd ruby-oci8-$(VERSION) && $(MAKE) RUBY="$(RUBY)" check
 	cd ruby-oci8-$(VERSION)/src && $(MAKE) RUBY="$(RUBY)" sitearchdir=../work sitelibdir=../work site-install
 	cd ruby-oci8-$(VERSION)/test && $(RUBY) -I../work -I../support test_all.rb
+
+#
+# for Windows
+#
+GEMPKG = ruby-oci8-unstable-2.0.1-x86-mswin32-60.gem
+
+ext\oci8\oci8lib_18.so:
+	c:\ruby\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby18')"
+	md ruby18
+	cd ruby18
+	c:\ruby\bin\ruby ..\setup.rb config -- --with-runtime-check
+	c:\ruby\bin\ruby ..\setup.rb setup
+	rem c:\ruby\bin\ruby ..\setup.rb test
+	cd ..
+	copy ruby18\ext\oci8\oci8lib_18.so ext\oci8\oci8lib_18.so
+
+ext\oci8\oci8lib_191.so:
+	c:\ruby\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby191')"
+	md ruby191
+	cd ruby191
+	c:\ruby-1.9.1\bin\ruby ..\setup.rb config -- --with-runtime-check
+	c:\ruby-1.9.1\bin\ruby ..\setup.rb setup
+	rem c:\ruby-1.9.1\bin\ruby ..\setup.rb test
+	cd ..
+	copy ruby191\ext\oci8\oci8lib_191.so ext\oci8\oci8lib_191.so
+	copy ruby191\lib\oci8.rb lib\oci8.rb
+
+$(GEMPKG): ext\oci8\oci8lib_18.so ext\oci8\oci8lib_191.so ruby-oci8.gemspec
+	c:\ruby-1.9.1\bin\gem build ruby-oci8.gemspec -- current
+
+test-win32-ruby18: $(GEMPKG)
+	c:\ruby\bin\gem install $(GEMPKG) --no-rdoc --no-ri
+	c:\ruby\bin\ruby -rubygems test\test_all.rb
+
+test-win32-ruby191: $(GEMPKG)
+	c:\ruby-1.9.1\bin\gem install $(GEMPKG) --no-rdoc --no-ri
+	c:\ruby-1.9.1\bin\ruby test\test_all.rb
+
+test-win32: test-win32-ruby18 test-win32-ruby191

data/NEWS

@@ -0,0 +1,6 @@
+2.0.1:
+
+* release a binary gem for Windows, which contains libraries for both
+  ruby 1.8 and ruby 1.9.1.
+* add OCI8#oracle_server_version.
+* fix bugs when fetching and binding time objects.

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/dist-files

@@ -1,5 +1,6 @@
 ChangeLog
 Makefile
+NEWS
 README
 VERSION
 dist-files

data/ext/oci8/apiwrap.yml

@@ -773,6 +773,15 @@ OCIServerDetach_nb:
             - OCIError *errhp
             - ub4 mode
 
+# round trip: ?
+OCIServerVersion:
+  :version: 800
+  :args:    - dvoid *hndlp
+            - OCIError *errhp
+            - OraText *bufp
+            - ub4 bufsz
+            - ub1 hndltype
+
 # round trip: 1
 OCIStmtExecute_nb:
   :version: 800
@@ -1114,6 +1123,17 @@ OCIRowidToChar:
             - ub2 *outbflp
             - OCIError *errhp
 
+# An undocumented function from Oracle 9i to Oracle 10g.
+# This is documented in Oracle 11g.
+OCIServerRelease:
+  :version: 900
+  :args:    - dvoid *hndlp
+            - OCIError *errhp
+            - OraText *bufp
+            - ub4 bufsz
+            - ub1 hndltype
+            - ub4 *version
+
 #
 # Oracle 9.2
 #

data/ext/oci8/bind.c

@@ -3,14 +3,13 @@
  * bind.c
  *
  * $Author: kubo $
- * $Date: 2009-01-12 00:11:09 +0900 (Mon, 12 Jan 2009) $
+ * $Date: 2009-02-10 22:50:40 +0900 (Tue, 10 Feb 2009) $
  *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  */
 #include "oci8.h"
 
 static ID id_bind_type;
-static ID id_set;
 
 static VALUE cOCI8BindTypeBase;
 
@@ -330,8 +329,11 @@ static const oci8_bind_class_t bind_binary_double_class = {
     SQLT_BDOUBLE
 };
 
-static inline VALUE oci8_get_data_at(const oci8_bind_class_t *obc, oci8_bind_t *obind, ub4 idx)
+static VALUE oci8_bind_get(VALUE self)
 {
+    oci8_bind_t *obind = DATA_PTR(self);
+    const oci8_bind_class_t *obc = (const oci8_bind_class_t *)obind->base.klass;
+    ub4 idx = obind->curar_idx;
     void **null_structp = NULL;
 
     if (NIL_P(obind->tdo)) {
@@ -345,26 +347,30 @@ static inline VALUE oci8_get_data_at(const oci8_bind_class_t *obc, oci8_bind_t *
     return obc->get(obind, (void*)((size_t)obind->valuep + obind->alloc_sz * idx), null_structp);
 }
 
-static VALUE oci8_get_data(VALUE self)
+VALUE oci8_bind_get_data(VALUE self)
 {
     oci8_bind_t *obind = DATA_PTR(self);
-    const oci8_bind_class_t *obc = (const oci8_bind_class_t *)obind->base.klass;
 
     if (obind->maxar_sz == 0) {
-        return oci8_get_data_at(obc, obind, 0);
+        obind->curar_idx = 0;
+        return rb_funcall(self, oci8_id_get, 0);
     } else {
         volatile VALUE ary = rb_ary_new2(obind->curar_sz);
         ub4 idx;
 
         for (idx = 0; idx < obind->curar_sz; idx++) {
-            rb_ary_store(ary, idx, oci8_get_data_at(obc, obind, idx));
+            obind->curar_idx = idx;
+            rb_ary_store(ary, idx, rb_funcall(self, oci8_id_get, 0));
         }
         return ary;
     }
 }
 
-static inline void oci8_set_data_at(const oci8_bind_class_t *obc, oci8_bind_t *obind, ub4 idx, VALUE val)
+static VALUE oci8_bind_set(VALUE self, VALUE val)
 {
+    oci8_bind_t *obind = DATA_PTR(self);
+    const oci8_bind_class_t *obc = (const oci8_bind_class_t *)obind->base.klass;
+    ub4 idx = obind->curar_idx;
 
     if (NIL_P(val)) {
         if (NIL_P(obind->tdo)) {
@@ -383,15 +389,16 @@ static inline void oci8_set_data_at(const oci8_bind_class_t *obc, oci8_bind_t *o
         }
         obc->set(obind, (void*)((size_t)obind->valuep + obind->alloc_sz * idx), null_structp, val);
     }
+    return self;
 }
 
-static VALUE oci8_set_data(VALUE self, VALUE val)
+void oci8_bind_set_data(VALUE self, VALUE val)
 {
     oci8_bind_t *obind = DATA_PTR(self);
-    const oci8_bind_class_t *obc = (const oci8_bind_class_t *)obind->base.klass;
 
     if (obind->maxar_sz == 0) {
-        oci8_set_data_at(obc, obind, 0, val);
+        obind->curar_idx = 0;
+        rb_funcall(self, oci8_id_set, 1, val);
     } else {
         ub4 size;
         ub4 idx;
@@ -402,11 +409,11 @@ static VALUE oci8_set_data(VALUE self, VALUE val)
             rb_raise(rb_eRuntimeError, "over the max array size");
         }
         for (idx = 0; idx < size; idx++) {
-            oci8_set_data_at(obc, obind, idx, RARRAY_PTR(val)[idx]);
+            obind->curar_idx = idx;
+            rb_funcall(self, oci8_id_set, 1, RARRAY_PTR(val)[idx]);
         }
         obind->curar_sz = size;
     }
-    return self;
 }
 
 static VALUE oci8_bind_initialize(VALUE self, VALUE svc, VALUE val, VALUE length, VALUE max_array_size)
@@ -438,7 +445,7 @@ static VALUE oci8_bind_initialize(VALUE self, VALUE svc, VALUE val, VALUE length
         bind_class->init_elem(obind, svc);
     }
     if (!NIL_P(val)) {
-        rb_funcall(self, id_set, 1, val);
+        oci8_bind_set_data(self, val);
     }
     return Qnil;
 }
@@ -474,11 +481,10 @@ void Init_oci8_bind(VALUE klass)
 {
     cOCI8BindTypeBase = klass;
     id_bind_type = rb_intern("bind_type");
-    id_set = rb_intern("set");
 
     rb_define_method(cOCI8BindTypeBase, "initialize", oci8_bind_initialize, 4);
-    rb_define_method(cOCI8BindTypeBase, "get", oci8_get_data, 0);
-    rb_define_method(cOCI8BindTypeBase, "set", oci8_set_data, 1);
+    rb_define_method(cOCI8BindTypeBase, "get", oci8_bind_get, 0);
+    rb_define_method(cOCI8BindTypeBase, "set", oci8_bind_set, 1);
 
     /* register primitive data types. */
     oci8_define_bind_class("String", &bind_string_class);

data/ext/oci8/extconf.rb

@@ -113,6 +113,16 @@ replace = {
 # make ruby script before running create_makefile.
 replace_keyword(File.dirname(__FILE__) + '/../../lib/oci8.rb.in', '../../lib/oci8.rb', replace)
 
+case RUBY_VERSION
+when /^1\.9\.1/
+  so_basename = "oci8lib_191"
+when /^1\.8/
+  so_basename = "oci8lib_18"
+else
+  raise 'unsupported ruby version: ' + RUBY_VERSION
+end
+$defs << "-DInit_oci8lib=Init_#{so_basename}"
+
 create_header()
 
 # make dependency file
@@ -140,6 +150,6 @@ end
 
 create_apiwrap()
 
-create_makefile("oci8lib")
+create_makefile(so_basename)
 
 exit 0

data/ext/oci8/oci8.c

@@ -524,11 +524,43 @@ static VALUE oci8_set_prefetch_rows(VALUE self, VALUE val)
     return val;
 }
 
+/*
+ * call-seq:
+ *   oracle_server_vernum -> Oracle server version number
+ *
+ */
+static VALUE oci8_oracle_server_vernum(VALUE self)
+{
+    oci8_svcctx_t *svcctx = DATA_PTR(self);
+    char buf[100];
+    ub4 version;
+    char *p;
+
+    if (have_OCIServerRelease) {
+        /* Oracle 9i or later */
+        oci_lc(OCIServerRelease(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), svcctx->base.type, &version));
+        return UINT2NUM(version);
+    } else {
+        /* Oracle 8.x */
+        oci_lc(OCIServerVersion(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), svcctx->base.type));
+        if ((p = strchr(buf, '.')) != NULL) {
+            unsigned int major, minor, update, patch, port_update;
+            while (p >= buf && *p != ' ') {
+                p--;
+            }
+            if (sscanf(p + 1, "%u.%u.%u.%u.%u", &major, &minor, &update, &patch, &port_update) == 5) {
+                return INT2FIX(ORAVERNUM(major, minor, update, patch, port_update));
+            }
+        }
+        return Qnil;
+    }
+}
+
 VALUE Init_oci8(void)
 {
     cOCI8 = oci8_define_class("OCI8", &oci8_svcctx_class);
 
-    oracle_client_vernum = oracle_client_version;
+    oracle_client_vernum = INT2FIX(oracle_client_version);
     if (have_OCIClientVersion) {
         sword major, minor, update, patch, port_update;
         OCIClientVersion(&major, &minor, &update, &patch, &port_update);
@@ -556,6 +588,7 @@ VALUE Init_oci8(void)
     rb_define_method(cOCI8, "long_read_len=", oci8_set_long_read_len, 1);
     rb_define_method(cOCI8, "break", oci8_break, 0);
     rb_define_method(cOCI8, "prefetch_rows=", oci8_set_prefetch_rows, 1);
+    rb_define_private_method(cOCI8, "oracle_server_vernum", oci8_oracle_server_vernum, 0);
     return cOCI8;
 }
 

data/ext/oci8/oci8.h

@@ -241,6 +241,7 @@ struct oci8_bind {
     sb4 alloc_sz; /* size of a element. */
     ub4 maxar_sz; /* maximum array size. */
     ub4 curar_sz; /* current array size. */
+    ub4 curar_idx;/* current array index. */
     VALUE tdo;
     union {
         void **null_structs;
@@ -375,6 +376,8 @@ void oci8_bind_free(oci8_base_t *base);
 void oci8_bind_hp_obj_mark(oci8_base_t *base);
 void Init_oci8_bind(VALUE cOCI8BindTypeBase);
 oci8_bind_t *oci8_get_bind(VALUE obj);
+void oci8_bind_set_data(VALUE self, VALUE val);
+VALUE oci8_bind_get_data(VALUE self);
 
 /* metadata.c */
 extern VALUE cOCI8MetadataBase;

data/ext/oci8/ocidatetime.c

@@ -3,7 +3,7 @@
  *  ocidatetime.c
  *
  * $Author: kubo $
- * $Date: 2008-09-10 23:07:07 +0900 (Wed, 10 Sep 2008) $
+ * $Date: 2009-02-15 23:58:37 +0900 (Sun, 15 Feb 2009) $
  *
  * Copyright (C) 2005-2008 KUBO Takehiro <kubo@jiubao.org>
  *
@@ -244,19 +244,19 @@ static VALUE bind_ocitimestamp_get(oci8_bind_t *obind, void *data, void *null_st
 
 static void bind_ocitimestamp_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
-    oci8_base_t *stmt;
+    oci8_base_t *parent;
     oci8_base_t *svcctx;
 
-    stmt = obind->base.parent;
-    if (stmt == NULL || stmt->type != OCI_HTYPE_STMT) {
-        rb_raise(rb_eRuntimeError, "oci8lib.so internal error [%s:%d, %p, %d]",
-                 __FILE__, __LINE__,
-                 stmt, stmt ? stmt->type : -1);
+    parent = obind->base.parent;
+    if (parent != NULL && parent->type == OCI_HTYPE_STMT) {
+        svcctx = parent->parent;
+    } else {
+        svcctx = parent;
     }
-    svcctx = stmt->parent;
     if (svcctx == NULL || svcctx->type != OCI_HTYPE_SVCCTX) {
-        rb_raise(rb_eRuntimeError, "oci8lib.so internal error [%s:%d, %p, %d]",
+        rb_raise(rb_eRuntimeError, "oci8lib.so internal error [%s:%d, %p, %d, %p, %d]",
                  __FILE__, __LINE__,
+                 parent, parent ? parent->type : -1,
                  svcctx, svcctx ? svcctx->type : -1);
     }
     oci8_set_ocitimestamp(*(OCIDateTime **)data, val, svcctx->self);
@@ -266,6 +266,7 @@ static void bind_ocitimestamp_init(oci8_bind_t *obind, VALUE svc, VALUE val, VAL
 {
     oci8_bind_dsc_t *obind_dsc = (oci8_bind_dsc_t *)obind;
 
+    oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)oci8_get_svcctx(svc));
     obind->value_sz = sizeof(OCIDateTime *);
     obind->alloc_sz = sizeof(OCIDateTime *);
     obind_dsc->type = OCI_DTYPE_TIMESTAMP_TZ;

data/ext/oci8/oraconf.rb

@@ -425,7 +425,7 @@ EOS
       so_ext = 'dylib'
       check_proc = Proc.new do |file|
         is_32bit = [0].pack('l!').size == 4
-        is_big_endian = "\x01\x02".unpack('s') == 0x0102
+        is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
         if is_32bit
           if is_big_endian
             this_cpu = :ppc    # 32-bit big-endian
@@ -444,7 +444,12 @@ EOS
           if so.cpu.include? this_cpu
             true
           else
-            puts "  skip: #{file} is for #{so.cpu} cpu."
+            if so.cpu.size > 1
+              arch_types = so.cpu[0..-2].join(', ') + ' and ' + so.cpu[-1].to_s
+            else
+              arch_types = so.cpu[0]
+            end
+            puts "  skip: #{file} is for #{arch_types} cpu."
             false
           end
         else

data/ext/oci8/stmt.c

@@ -25,7 +25,6 @@ static ID id_at_names;
 static ID id_empty_p;
 static ID id_at_con;
 static ID id_clear;
-static ID id_set;
 
 VALUE cOCIStmt;
 
@@ -428,7 +427,7 @@ static VALUE oci8_stmt_do_fetch(oci8_stmt_t *stmt, oci8_svcctx_t *svcctx)
 #endif /* USE_DYNAMIC_FETCH */
     ary = rb_ary_new2(RARRAY_LEN(stmt->defns));
     for (idx = 0; idx < RARRAY_LEN(stmt->defns); idx++) {
-        rb_ary_store(ary, idx, rb_funcall(RARRAY_PTR(stmt->defns)[idx], oci8_id_get, 0));
+        rb_ary_store(ary, idx, oci8_bind_get_data(RARRAY_PTR(stmt->defns)[idx]));
     }
     return ary;
 }
@@ -599,7 +598,7 @@ static VALUE oci8_stmt_aref(VALUE self, VALUE key)
     if (NIL_P(obj)) {
         return Qnil;
     }
-    return rb_funcall(obj, oci8_id_get, 0);
+    return oci8_bind_get_data(obj);
 }
 
 /*
@@ -650,8 +649,8 @@ static VALUE oci8_stmt_aset(VALUE self, VALUE key, VALUE val)
             rb_ivar_set(self, id_at_actual_array_size, INT2NUM(bind_array_size));
         }
     }     
-
-    return rb_funcall(obj, oci8_id_set, 1, val);
+    oci8_bind_set_data(obj, val);
+    return val;
 }
 
 /*
@@ -781,7 +780,6 @@ void Init_oci8_stmt(VALUE cOCI8)
     id_at_con = rb_intern("@con");
     id_empty_p = rb_intern("empty?");
     id_clear = rb_intern("clear");
-    id_set = rb_intern("set");
 
     rb_define_private_method(cOCIStmt, "initialize", oci8_stmt_initialize, -1);
     rb_define_private_method(cOCIStmt, "__define", oci8_define_by_pos, 2);

data/lib/oci8.rb.in

@@ -18,7 +18,14 @@ if RUBY_PLATFORM =~ /cygwin/
   end
 end
 
-require 'oci8lib'
+case RUBY_VERSION
+when /^1\.9\.1/
+  require 'oci8lib_191'
+when /^1\.8/
+  require 'oci8lib_18'
+else
+  raise 'unsupported ruby version: ' + RUBY_VERSION
+end
 
 if OCI8.respond_to? :encoding
   if defined? DEFAULT_OCI8_ENCODING

data/lib/oci8/datetime.rb

@@ -20,7 +20,7 @@ class OCI8
       #
       # This parameter is used when both or either of Oracle server and client
       # version is Oracle 8i or lower. If both versions are Oracle 9i or upper,
-      # the default timezone is determined by session timezone.
+      # the default timezone is determined by the session timezone.
       def self.default_timezone=(tz)
         if tz != :local and tz != :utc
           raise ArgumentError, "expected :local or :utc but #{tz}"
@@ -111,11 +111,13 @@ class OCI8
 
       def ocidate_to_time(ary)
         year, month, day, hour, minute, sec = ary
-        begin
-          ::Time.send(@@default_timezone, year, month, day, hour, minute, sec)
-        rescue StandardError
-          ocidate_to_datetime(ary)
+        if year >= 139
+          begin
+            return ::Time.send(@@default_timezone, year, month, day, hour, minute, sec)
+          rescue StandardError
+          end
         end
+        ocidate_to_datetime(ary)
       end
 
       if OCI8.oracle_client_version >= ORAVER_9_0
@@ -149,7 +151,7 @@ class OCI8
           elsif @@time_offset == tz_hour * 3600 + tz_min * 60
             timezone = :local
           end
-          if timezone
+          if timezone and year >= 139
             begin
               # Ruby 1.9 Time class's resolution is nanosecond.
               # But the last argument type is millisecond.

data/lib/oci8/oci8.rb

@@ -135,6 +135,31 @@ class OCI8
     "#<OCI8:#{username}>"
   end
 
+  # :call-seq:
+  #   oracle_server_version -> oraver
+  #
+  # Returns an OCI8::OracleVersion of the Oracle server version.
+  #
+  # See also: OCI8.oracle_client_version
+  def oracle_server_version
+    unless defined? @oracle_server_version
+      if vernum = oracle_server_vernum
+        # If the Oracle client is Oracle 9i or upper,
+        # get the server version from the OCI function OCIServerRelease.
+        @oracle_server_version = OCI8::OracleVersion.new(vernum)
+      else
+        # Otherwise, get it from v$version.
+        self.exec('select banner from v$version') do |row|
+          if /^Oracle.*?(\d+\.\d+\.\d+\.\d+\.\d+)/ =~ row[0]
+            @oracle_server_version = OCI8::OracleVersion.new($1)
+            break
+          end
+        end
+      end
+    end
+    @oracle_server_version
+  end
+
   module BindType
     Mapping = {}
 
@@ -703,7 +728,7 @@ OCI8::BindType::Mapping[:date] = OCI8::BindType::Time
 
 if OCI8.oracle_client_version >= OCI8::ORAVER_9_0
   OCI8::BindType::Mapping[:timestamp] = OCI8::BindType::Time
-  OCI8::BindType::Mapping[:timestamp_tz] = OCI8::BindType::DateTime
+  OCI8::BindType::Mapping[:timestamp_tz] = OCI8::BindType::Time
   OCI8::BindType::Mapping[:timestamp_ltz] = OCI8::BindType::Time
   OCI8::BindType::Mapping[:interval_ym] = OCI8::BindType::IntervalYM
   OCI8::BindType::Mapping[:interval_ds] = OCI8::BindType::IntervalDS

data/ruby-oci8.gemspec

@@ -6,6 +6,7 @@
 # To make a binary gems package:
 #   gem build ruby-oci8.gemspec -- current
 #
+require 'fileutils'
 
 if ARGV.size > 3
    gem_platform = ARGV[3]
@@ -28,27 +29,35 @@ EOS
   s.platform = gem_platform
   files = File.read('dist-files').split("\n")
   if gem_platform == Gem::Platform::RUBY
-    s.require_paths = ['lib']
     s.extensions << 'ext/oci8/extconf.rb'
     s.required_ruby_version = '>= 1.8.0'
   else
-    s.require_paths = ['lib', 'ext/oci8']
-    if RUBY_VERSION =~ /^1\.9\./
+    so_files = Dir.glob('ext/oci8/oci8lib_*.so')
+    has_1_8 = so_files.include? 'ext/oci8/oci8lib_18.so'
+    has_1_9_1 = so_files.include? 'ext/oci8/oci8lib_191.so'
+    if has_1_8 and has_1_9_1
+      puts 'Binary gem for ruby 1.8 and 1.9.1'
+      s.required_ruby_version = '>= 1.8.0'
+    elsif has_1_8 and !has_1_9_1
+      puts 'Binary gem for ruby 1.8'
+      s.required_ruby_version = '~> 1.8.0'
+    elsif !has_1_8 and has_1_9_1
+      puts 'Binary gem for ruby 1.9.1'
       s.required_ruby_version = '~> 1.9.1'
     else
-      s.required_ruby_version = '~> 1.8.0'
+      raise "No compiled binary are found. Run make in advance."
     end
-    # check files created by a make command.
-    ['ext/oci8/oci8lib.so', 'lib/oci8.rb'].each do |file|
-      raise <<EOS unless File.exist?(file)
-#{file} doesn't exist. Run make in advance.
-EOS
-      #'
-      files << file
+    FileUtils.copy so_files, 'lib', :preserve => true
+    files.reject! do |fname|
+      fname =~ /^ext/
+    end
+    so_files.each do |fname|
+      files << 'lib/' + File.basename(fname)
     end
+    files << 'lib/oci8.rb'
   end
   s.files = files
   s.test_files = 'test/test_all.rb'
-  s.rdoc_options = ['--main', 'README', '--exclude', 'ext/*']
+  s.rdoc_options = ['--main', 'README']
   s.extra_rdoc_files = ['README']
 end

data/test/test_array_dml.rb

@@ -22,7 +22,8 @@ CREATE TABLE test_table
    N NUMBER(10, 2),
    D DATE,
    INT NUMBER(30), 
-   BIGNUM NUMBER(30))
+   BIGNUM NUMBER(30),
+   T TIMESTAMP)
 STORAGE (
    INITIAL 4k
    NEXT 4k
@@ -31,23 +32,25 @@ STORAGE (
    PCTINCREASE 0)
 EOS
     @conn.exec(sql)
-    cursor = @conn.parse("INSERT INTO test_table VALUES (:C, :V, :N, :D, :INT, :BIGNUM)")
+    cursor = @conn.parse("INSERT INTO test_table VALUES (:C, :V, :N, :D, :INT, :BIGNUM, :T)")
     max_array_size = 3
     cursor.max_array_size= max_array_size
     
     cursor.bind_param_array(1, nil, String)
     cursor.bind_param_array(2, nil ,String)
     cursor.bind_param_array(3, nil, Fixnum)
-    cursor.bind_param_array(4, nil, OraDate)    
+    cursor.bind_param_array(4, nil, OraDate)
     cursor.bind_param_array(5, nil, Integer)
     cursor.bind_param_array(6, nil, Bignum)
-    
+    cursor.bind_param_array(7, nil, DateTime)
+
     c_arr = Array.new
     v_arr = Array.new
     n_arr = Array.new
     d_arr = Array.new
     int_arr = Array.new
     bignum_arr = Array.new
+    t_arr = Array.new
     
     1.upto(30) do |i|
       c_arr << format("%10d", i * 10)
@@ -56,6 +59,7 @@ EOS
       d_arr <<  OraDate.new(2000 + i, 12, 24, 23, 59, 59)
       int_arr << i * 11111111111
       bignum_arr << i * 10000000000
+      t_arr <<  DateTime.new(2000 + i, 12, 24, 23, 59, 59)
       
       if i%max_array_size == 0
         cursor[1] = c_arr
@@ -64,15 +68,24 @@ EOS
         cursor[4] = d_arr
         cursor[5] = int_arr
         cursor[6] = bignum_arr
+        cursor[7] = t_arr
         
         r = cursor.exec_array
         assert_equal(max_array_size, r)
+        assert_equal(c_arr, cursor[1])
+        assert_equal(v_arr, cursor[2])
+        assert_equal(n_arr, cursor[3])
+        assert_equal(d_arr, cursor[4])
+        assert_equal(int_arr, cursor[5])
+        assert_equal(bignum_arr, cursor[6])
+        assert_equal(t_arr, cursor[7])
         c_arr.clear
         v_arr.clear
         n_arr.clear
         d_arr.clear
         int_arr.clear
         bignum_arr.clear
+        t_arr.clear
       end
     end
     cursor.close
@@ -81,7 +94,7 @@ EOS
     cursor.define(5, Integer)
     cursor.define(6, Bignum)
     cursor.exec
-    assert_equal(["C","V","N","D","INT","BIGNUM"], cursor.get_col_names)
+    assert_equal(["C","V","N","D","INT","BIGNUM","T"], cursor.get_col_names)
     1.upto(30) do |i|
       rv = cursor.fetch
       assert_equal(format("%10d", i * 10), rv[0])
@@ -91,6 +104,7 @@ EOS
       assert_equal(tm, rv[3])
       assert_equal(i * 11111111111, rv[4])
       assert_equal(i * 10000000000, rv[5])
+      assert_equal(tm, rv[6])
     end
     assert_nil(cursor.fetch)
     drop_table('test_table')
@@ -131,13 +145,15 @@ EOS
     sql = <<-EOS
 CREATE TABLE test_table
   (N NUMBER(10, 2) NOT NULL,
-   V VARCHAR(20))
+   V VARCHAR(20),
+   T TIMESTAMP)
 EOS
     @conn.exec(sql)
-    cursor = @conn.parse("INSERT INTO test_table VALUES (:N, :V)")
+    cursor = @conn.parse("INSERT INTO test_table VALUES (:N, :V, :T)")
     cursor.max_array_size = 3
     cursor.bind_param_array(1, [1, 2, 3])
     cursor.bind_param_array(2, ['happy', 'new', 'year'])
+    cursor.bind_param_array(3, [Time.gm(1990,1,1), Time.gm(2000,1,1), Time.gm(2010,1,1)])
     assert_nothing_raised() { cursor.exec_array }
     cursor.max_array_size = 2
     assert_raise(RuntimeError) { cursor.exec_array }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 +09:00
+date: 2009-03-18 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 files: 
 - ChangeLog
 - Makefile
+- NEWS
 - README
 - VERSION
 - dist-files
@@ -98,8 +99,6 @@ post_install_message:
 rdoc_options: 
 - --main
 - README
-- --exclude
-- ext/*
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby interface for Oracle using OCI8 API