ruby-oci8 2.1.4 → 2.1.5

data/.yardopts

@@ -5,6 +5,7 @@
 --exclude lib/oci8/compat.rb
 --exclude lib/dbd
 --hide-void-return
+--charset UTF-8
 -
 NEWS
 COPYING

data/ChangeLog

@@ -1,3 +1,70 @@
+2013-03-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: revert the previous commit because old
+	    rubygems doesn't support:
+	       required_ruby_version = ['>= 1.8.0', '<= 2.0.0']
+
+2013-03-09  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.1.5 and 2.1.4
+	* VERSION: change the version to 2.1.5.
+	* docs/platform-specific-issues.md: remove obsolete description.
+	* ext/oci8/extconf.rb, ext/oci8/oraconf.rb: fix to compile for
+	    Windows x64 client.
+	* ruby-oci8.gemspec: change required_ruby_version range
+	    when a binary gem includes more than one compiled object.
+	* test/test_connection_pool.rb: fix to pass tests on slow
+	    machines.
+
+2013-03-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c, lib/oci8/oci8.rb, lib/oci8/oracle_version.rb:
+	    refactoring.
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb, test/test_oci8.rb: set 'rubyoci8' as
+	    the driver name, which is displayed in
+	    V$SESSION_CONNECT_INFO.CLIENT_DRIVER.
+	    (require Oracle 11g or upper)
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in: use RbConfig::CONFIG instead of obsolete
+	    constant Config::CONFIG.
+	* lib/oci8/object.rb, test/test_bind_time.rb, test/test_metadata.rb
+	  test/test_object.rb, test/test_oci8.rb:
+	    suppress warning: assigned but unused variable
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.c, ext/oci8/oci8.h:
+	    refactor oci8_lob_t.
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: fix segmentation fault when the process
+	    exits on rubinius.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* .yardopts, ext/oci8/object.c, lib/oci8/metadata.rb,
+	  lib/oci8/oracle_version.rb: update comments for rdoc/yard.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocihandle.c: change arguments of internal methods
+	    OCIHandle#attr_get_*() to ignore "ORA-24328: illegal
+	    attribute value".
+	* lib/oci8/metadata.rb: change OCI8::Metadata::Base#obj_id,
+	    #obj_name and #obj_schema not to raise "ORA-24328:
+	    illegal attribute value".
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: fix for ruby 2.0.0 to make binary gems.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: fix for compilation on Windows x64 by mingw64.
+
+2013-01-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: export a main function for Solaris x86 (32-bit).
+	    When a main function is invisible from Oracle instant client
+	    11.2.0.3 for Solaris x86 (32-bit), OCIEnvCreate() fails by
+	    unknown reasons.
+	* docs/platform-specific-issues.md: change the workaround for
+	    Solaris x86 (32-bit) instant client.
+
 2013-01-06  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.1.4 and 2.1.3
 	* VERSION: change the version to 2.1.4.

data/NEWS

@@ -1,5 +1,26 @@
 # @markup markdown
 
+2.1.5
+=====
+
+New Features
+------------
+
+### V$SESSION_CONNECT_INFO.CLIENT_DRIVER.
+
+'rubyoci8' is set as the driver name, which is displayed in
+V$SESSION_CONNECT_INFO.CLIENT_DRIVER when both the client and
+the server are Oracle 11g or upper.
+
+Fixed Issues
+------------
+
+-   fix segmentation fault when the process exits on rubinius.
+
+-   fix "OCI Library Initialization Error" only when the Oracle
+    instant client is 11.2.0.3 for Solaris x86 32-bit, the ruby
+    version is 1.9.3 or upper and the ruby is compiled by gcc.
+
 2.1.4
 =====
 

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/docs/platform-specific-issues.md

@@ -34,15 +34,10 @@ Note: "`" is a back quote.
 Mac OS X
 ========
 
-OS X 10.7 Lion
---------------
-
-64-bit instant client doesn't work. Use 32-bit ruby and instant client or jruby.
+OS X 10.7+
+----------
 
-See:
-
-* {http://rubyforge.org/forum/forum.php?thread\_id=49548&forum\_id=1078}
-* {https://forums.oracle.com/forums/thread.jspa?threadID=2187558}
+Use the latest 64-bit instant client. The older 64-bit (10.2.0.4) instant client [doesn't work](https://forums.oracle.com/forums/thread.jspa?threadID=2187558). The older 32-bit instant client will work but only with 32-bit ruby or jruby (using JDBC).
 
 Intel Mac (64-bit)
 ------------------
@@ -59,7 +54,7 @@ The Intel Instant client is for Mac OS X 10.5 Leopard. If you are using 10.4 Tig
 use one of the following workarounds.
 
 * compile ruby as ppc. (look at [How to setup Ruby and Oracle client on Intel Mac](http://blog.rayapps.com/2007/08/27/how-to-setup-ruby-and-oracle-client-on-intel-mac/))
-* use [ruby-odbc|http://www.ch-werner.de/rubyodbc/] and a third party ODBC driver ([Actual Technologies](http://www.actualtechnologies.com) or [OpenLink Software](http://uda.openlinksw.com/)).
+* use [ruby-odbc](http://www.ch-werner.de/rubyodbc/) and a third party ODBC driver ([Actual Technologies](http://www.actualtechnologies.com) or [OpenLink Software](http://uda.openlinksw.com/)).
 * use JRuby and Oracle JDBC driver.
 
 PowerPC Mac
@@ -74,21 +69,6 @@ You need a same compiler which is used to make ruby itself.
 For example, if the ruby is compiled by gcc, you need gcc. If it is compiled by Oracle Solaris Studio
 (formerly called as Sun Studio), you need Oracle Solaris Studio.
 
-If ruby is compiled by gcc and "require 'oci8'" raises "OCI Library Initialization Error",
-you may need to recompile ruby as follows:
-
-    $ bzip2 -dc ruby-1.9.3-pxxx.tar.bz2 | tar xvf -
-    $ cd ruby-1.9.3-pxxx
-    $ vi main.c   # <- Add RUBY_FUNC_EXPORTED just before "int main(..)" as follows:
-    -------------
-    RUBY_FUNC_EXPORTED  /* Add this line */
-    int
-    main(int argc, char **argv)
-    -------------
-    $ ./configure
-    $ make
-    $ make install
-
 If you use Blastwave.org's ruby and want not to install Sun Studio,
 you can edit rbconfig.rb by your self. [(look at here)](http://forum.textdrive.com/viewtopic.php?id=12630)
 

data/ext/oci8/extconf.rb

@@ -225,11 +225,12 @@ when /mingw32/
   if RbConfig::MAKEFILE_CONFIG["LDSHARED"].gsub!(/-s\b/, '')
     alias :oci8_configuration_orig :configuration
     def configuration(*args)
+      prefix = [nil].pack('P').size == 4 ? '_' : ''
       oci8_configuration_orig(*args) << <<EOS
 
 # Dirty hack to get the map file.
 all__: all
-	nm $(DLLIB) | grep ' [TtBb] _[A-Za-z]' > $(TARGET).map
+	nm $(DLLIB) | grep ' [TtBb] #{prefix}[A-Za-z]' > $(TARGET).map
 	strip -s $(DLLIB)
 EOS
     end

data/ext/oci8/lob.c

@@ -1,4 +1,9 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ * lob.c - part of ruby-oci8
+ *
+ * Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
+ */
 #include "oci8.h"
 
 static ID id_plus;
@@ -22,8 +27,7 @@ enum state {
 };
 typedef struct {
     oci8_base_t base;
-    VALUE svc;
-    OCISvcCtx *svchp;
+    oci8_svcctx_t *svcctx;
     ub4 pos;
     int char_width;
     ub1 csfrm;
@@ -31,6 +35,15 @@ typedef struct {
     enum state state;
 } oci8_lob_t;
 
+static oci8_svcctx_t *check_svcctx(oci8_lob_t *lob)
+{
+    oci8_svcctx_t *svcctx = lob->svcctx;
+    if (svcctx == NULL || svcctx->base.type != OCI_HTYPE_SVCCTX) {
+        rb_raise(rb_eRuntimeError, "Invalid Svcctx");
+    }
+    return svcctx;
+}
+
 static VALUE oci8_lob_write(VALUE self, VALUE data);
 
 static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
@@ -101,20 +114,22 @@ void oci8_assign_bfile(oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
 static void oci8_lob_mark(oci8_base_t *base)
 {
     oci8_lob_t *lob = (oci8_lob_t *)base;
-    rb_gc_mark(lob->svc);
+    if (lob->svcctx != NULL) {
+        rb_gc_mark(lob->svcctx->base.self);
+    }
 }
 
 static void oci8_lob_free(oci8_base_t *base)
 {
     oci8_lob_t *lob = (oci8_lob_t *)base;
     boolean is_temporary;
+    oci8_svcctx_t *svcctx = lob->svcctx;
 
-    if (lob->svchp != NULL
+    if (svcctx != NULL
         && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
 
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
         oci8_temp_lob_t *temp_lob = ALLOC(oci8_temp_lob_t);
 
         temp_lob->next = svcctx->temp_lobs;
@@ -124,11 +139,10 @@ static void oci8_lob_free(oci8_base_t *base)
         lob->base.hp.ptr = NULL;
 #else
         /* FIXME: This may stall the GC. */
-        OCILobFreeTemporary(lob->svchp, oci8_errhp, lob->base.hp.lob);
+        OCILobFreeTemporary(svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob);
 #endif
     }
-    lob->svc = Qnil;
-    lob->svchp = NULL;
+    lob->svcctx = NULL;
 }
 
 static oci8_base_vtable_t oci8_lob_vtable = {
@@ -139,7 +153,7 @@ static oci8_base_vtable_t oci8_lob_vtable = {
 
 static ub4 oci8_lob_get_length(oci8_lob_t *lob)
 {
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 len;
 
     chker2(OCILobGetLength_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
@@ -150,7 +164,7 @@ static ub4 oci8_lob_get_length(oci8_lob_t *lob)
 static void lob_open(oci8_lob_t *lob)
 {
     if (lob->state == S_CLOSE) {
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = check_svcctx(lob);
 
         chker2(OCILobOpen_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, OCI_DEFAULT),
                &svcctx->base);
@@ -161,7 +175,7 @@ static void lob_open(oci8_lob_t *lob)
 static void lob_close(oci8_lob_t *lob)
 {
     if (lob->state == S_OPEN) {
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = check_svcctx(lob);
 
         chker2(OCILobClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob),
                &svcctx->base);
@@ -172,7 +186,7 @@ static void lob_close(oci8_lob_t *lob)
 static void bfile_close(oci8_lob_t *lob)
 {
     if (lob->state == S_BFILE_OPEN) {
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = check_svcctx(lob);
 
         chker2(OCILobFileClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob),
                &svcctx->base);
@@ -228,28 +242,26 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
     oci8_lob_t *lob = DATA_PTR(self);
     VALUE svc;
     VALUE val;
+    oci8_svcctx_t *svcctx;
     sword rv;
 
     rb_scan_args(argc, argv, "11", &svc, &val);
-    TO_SVCCTX(svc); /* check argument type */
+    svcctx = oci8_get_svcctx(svc);
     rv = OCIDescriptorAlloc(oci8_envhp, &lob->base.hp.ptr, OCI_DTYPE_LOB, 0, NULL);
     if (rv != OCI_SUCCESS)
         oci8_env_raise(oci8_envhp, rv);
     lob->base.type = OCI_DTYPE_LOB;
-    lob->svc = svc;
-    lob->svchp = NULL;
     lob->pos = 0;
     lob->char_width = 1;
     lob->csfrm = csfrm;
     lob->lobtype = lobtype;
     lob->state = S_NO_OPEN_CLOSE;
     oci8_link_to_parent((oci8_base_t*)lob, (oci8_base_t*)DATA_PTR(svc));
+    lob->svcctx = svcctx;
     if (!NIL_P(val)) {
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
         OCI8StringValue(val);
         chker2(OCILobCreateTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, 0, csfrm, lobtype, TRUE, OCI_DURATION_SESSION),
                &svcctx->base);
-        lob->svchp = oci8_get_oci_svcctx(svc);
         oci8_lob_write(self, val);
         lob->pos = 0; /* reset the position */
     }
@@ -461,7 +473,7 @@ static VALUE oci8_lob_rewind(VALUE self)
 static VALUE oci8_lob_truncate(VALUE self, VALUE len)
 {
     oci8_lob_t *lob = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
 
     lob_open(lob);
     chker2(OCILobTrim_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2UINT(len)),
@@ -502,7 +514,7 @@ static VALUE oci8_lob_set_size(VALUE self, VALUE len)
 static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 {
     oci8_lob_t *lob = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 length;
     ub4 nchar;
     ub4 amt;
@@ -626,7 +638,7 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 static VALUE oci8_lob_write(VALUE self, VALUE data)
 {
     oci8_lob_t *lob = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 amt;
 
     lob_open(lob);
@@ -695,7 +707,7 @@ static VALUE oci8_lob_flush(VALUE self)
 static VALUE oci8_lob_get_chunk_size(VALUE self)
 {
     oci8_lob_t *lob = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
     ub4 len;
 
     chker2(OCILobGetChunkSize_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
@@ -710,11 +722,11 @@ static VALUE oci8_lob_clone(VALUE self)
     VALUE newobj;
     boolean is_temporary;
 
-    newobj = rb_funcall(CLASS_OF(self), oci8_id_new, 1, lob->svc);
+    newobj = rb_funcall(CLASS_OF(self), oci8_id_new, 1, lob->svcctx ? lob->svcctx->base.self : Qnil);
     newlob = DATA_PTR(newobj);
     if (OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = check_svcctx(lob);
         chker2(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &newlob->base.hp.lob),
                &svcctx->base);
     } else {
@@ -796,16 +808,16 @@ static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
     VALUE svc;
     VALUE dir_alias;
     VALUE filename;
+    oci8_svcctx_t *svcctx;
     int rv;
 
     rb_scan_args(argc, argv, "12", &svc, &dir_alias, &filename);
-    TO_SVCCTX(svc); /* check argument type */
+    svcctx = oci8_get_svcctx(svc);
     rv = OCIDescriptorAlloc(oci8_envhp, &lob->base.hp.ptr, OCI_DTYPE_LOB, 0, NULL);
     if (rv != OCI_SUCCESS) {
         oci8_env_raise(oci8_envhp, rv);
     }
     lob->base.type = OCI_DTYPE_LOB;
-    lob->svc = svc;
     lob->pos = 0;
     lob->char_width = 1;
     lob->csfrm = SQLCS_IMPLICIT;
@@ -817,6 +829,7 @@ static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
         oci8_bfile_set_name(self, dir_alias, filename);
     }
     oci8_link_to_parent((oci8_base_t*)lob, (oci8_base_t*)DATA_PTR(svc));
+    lob->svcctx = svcctx;
     return Qnil;
 }
 
@@ -892,7 +905,7 @@ static VALUE oci8_bfile_set_filename(VALUE self, VALUE filename)
 static VALUE oci8_bfile_exists_p(VALUE self)
 {
     oci8_lob_t *lob = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    oci8_svcctx_t *svcctx = check_svcctx(lob);
     boolean flag;
 
     chker2(OCILobFileExists_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &flag),

data/ext/oci8/object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2002-2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
  */
 
 /*
@@ -681,30 +681,54 @@ void Init_oci_object(VALUE cOCI8)
     /* OCI8::TDO */
     cOCI8TDO = oci8_define_class_under(cOCI8, "TDO", &oci8_tdo_vtable);
     rb_define_private_method(cOCI8TDO, "setup", oci8_tdo_setup, 2);
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_STRING", INT2FIX(ATTR_STRING));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_RAW", INT2FIX(ATTR_RAW));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_OCINUMBER", INT2FIX(ATTR_OCINUMBER));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_FLOAT", INT2FIX(ATTR_FLOAT));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_INTEGER", INT2FIX(ATTR_INTEGER));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_OCIDATE", INT2FIX(ATTR_OCIDATE));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BINARY_DOUBLE", INT2FIX(ATTR_BINARY_DOUBLE));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BINARY_FLOAT", INT2FIX(ATTR_BINARY_FLOAT));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_NAMED_TYPE", INT2FIX(ATTR_NAMED_TYPE));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_NAMED_COLLECTION", INT2FIX(ATTR_NAMED_COLLECTION));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_CLOB", INT2FIX(ATTR_CLOB));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_NCLOB", INT2FIX(ATTR_NCLOB));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BLOB", INT2FIX(ATTR_BLOB));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BFILE", INT2FIX(ATTR_BFILE));
 #define ALIGNMENT_OF(type) (size_t)&(((struct {char c; type t;}*)0)->t)
+    /* @private */
     rb_define_const(cOCI8TDO, "SIZE_OF_POINTER", INT2FIX(sizeof(void *)));
+    /* @private */
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_POINTER", INT2FIX(ALIGNMENT_OF(void *)));
+    /* @private */
     rb_define_const(cOCI8TDO, "SIZE_OF_OCINUMBER", INT2FIX(sizeof(OCINumber)));
+    /* @private */
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_OCINUMBER", INT2FIX(ALIGNMENT_OF(OCINumber)));
+    /* @private */
     rb_define_const(cOCI8TDO, "SIZE_OF_OCIDATE", INT2FIX(sizeof(OCIDate)));
+    /* @private */
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_OCIDATE", INT2FIX(ALIGNMENT_OF(OCIDate)));
+    /* @private */
     rb_define_const(cOCI8TDO, "SIZE_OF_FLOAT", INT2FIX(sizeof(float)));
+    /* @private */
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_FLOAT", INT2FIX(ALIGNMENT_OF(float)));
+    /* @private */
     rb_define_const(cOCI8TDO, "SIZE_OF_DOUBLE", INT2FIX(sizeof(double)));
+    /* @private */
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_DOUBLE", INT2FIX(ALIGNMENT_OF(double)));
 
     /* OCI8::NamedType */