ruby-oci8 2.1.3 → 2.1.4

data/ChangeLog

@@ -1,3 +1,53 @@
+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.
+	* docs/platform-specific-issues.md: update solaris-specific document.
+	* ext/oci8/connection_pool.c, ext/oci8/encoding.c, ext/oci8/metadata.c,
+	  ext/oci8/oci8.c,lib/oci8.rb.in, lib/oci8/metadata.rb, lib/oci8/oci8.rb,
+	  lib/oci8/oracle_version.rb, lib/oci8/properties.rb: update comments for yard.
+	* test/test_clob.rb: change a lob size when ORA-24817 is raised to
+	    pass tests on Windows.
+
+2013-01-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c, lib/oci8/properties.rb: add OCI8.properties[:events_mode]
+	    to support Fast Application Notification (FAN).
+
+2013-01-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: add languange mode to the extension
+	    library name when ths ruby engine is rubinius and explicitly claim that
+	    jruby is not supported when it is jruby.
+
+2013-01-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/encoding.c, lib/oci8/encoding-init.rb: delete an internal method
+	    OCI8.nls_ratio= when the ruby is 1.9 or greater. nls_ratio is set by
+	    OCI8.encoding=.
+
+2012-12-23  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.h, ext/oci8/oci8lib.c, test/test_clob.rb:
+	    fix SEGV when a temporary LOB is freed when OCILobRead returns OCI_NEED_DATA.
+	    (github issue #20 reported by Edgars Beigarts)
+
+2012-12-18  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/error.c, lib/oci8/oci8.rb: change the OCIError constructor to
+	    accept an Oracle error code as the first parameter and create a message
+	    which depends on NLS_LANG.
+	* lib/oci8/metadata.rb: fix OCI8.describe_table not to follow synonyms
+	    until stack overflow. Now the recursive level is limited to 20.
+	    (github issue #26 reported by Brian Henderson)
+
+2012-12-16  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: use RUBY_VERSION instead of
+	   RbConfig::CONFIG['ruby_version'] to know the ruby ABI version.
+	   The latter may be changed by the configure option --with-ruby-version.
+	   (github issue #24 reported by suhrawardi)
+
+2012-12-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: add a script encoding magic comment for ruby 2.0.0 preview2.
+	    (github issue #25 reported by aboltart)
+
+2012-12-02  KUBO Takehiro  <kubo@jiubao.org>
+	* test/test_encoding.rb: fix to pass tests with ruby 2.0.0 preview2.
+
 2012-11-11  KUBO Takehiro  <kubo@jiubao.org>
 	* ext/oci8/lob.c: use OCILobLocatorAssign_nb (non-blocking version)
 	    instead of OCILobLocatorAssign (blocking version).

data/NEWS

@@ -1,5 +1,46 @@
 # @markup markdown
 
+2.1.4
+=====
+
+New Features
+------------
+
+### Fast Application Notification (FAN) support
+
+Look at {http://php.net/manual/en/oci8.connection.php} to know what is FAN.
+[oci8.events](http://php.net/manual/en/oci8.configuration.php#ini.oci8.events) in PHP
+corresponds to {OCI8.properties  OCI8.properties[:events_mode]} in ruby-oci8.
+
+Note: You need to set `OCI8.properties[:events_mode]` after `"require 'oci8'"` and before
+any methods which call Oracle OCI functions.
+
+Fixed Issues
+------------
+
+-   fix SEGV when a temporary LOB is freed when `OCILobRead` returns `OCI_NEED_DATA`.
+    See: [github issue #20](https://github.com/kubo/ruby-oci8/issues/20)
+
+    (reported by Edgars Beigarts)
+
+-   use `RUBY_VERSION` instead of `RbConfig::CONFIG['ruby_version']` to know the
+    ruby ABI version. The latter may be changed by the configure option
+    --with-ruby-version.
+    See: [github issue #24](https://github.com/kubo/ruby-oci8/issues/24)
+
+    (reported by suhrawardi)
+
+-   add a script encoding magic comment for ruby 2.0.0 preview2.
+    See: [github issue #25](https://github.com/kubo/ruby-oci8/issues/25)
+
+    (reported by aboltart)
+
+-   fix {OCI8#describe_table} not to follow synonyms until stack overflow.
+    Now the recursive level is limited to 20.
+    See: [github issue #26](https://github.com/kubo/ruby-oci8/issues/26)
+
+    (reported by Brian Henderson)
+
 2.1.3
 =====
 

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/docs/platform-specific-issues.md

@@ -71,15 +71,23 @@ Solaris
 =======
 
 You need a same compiler which is used to make ruby itself.
-
-There are two ruby packages.
-
-* [Sunfreeware.com](http://www.sunfreeware.com/)
-* [Blastwave.org](http://www.blastwave.org/)
-
-The former is compiled by gcc. The latter is compiled by
-[Sun Studio](http://developers.sun.com/sunstudio/).
-The both compilers are freely available.
+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)
@@ -91,8 +99,8 @@ If you use Sunfreeware.com's ruby and
 prints "yes", you may need to edit rbconfig.rb distributed with the ruby
 as follows:
 
-   from: CONFIG["LDFLAGS"] = "-L.  -Wl,-E"
-   to:   CONFIG["LDFLAGS"] = "-L. "
+    from: CONFIG["LDFLAGS"] = "-L.  -Wl,-E"
+    to:   CONFIG["LDFLAGS"] = "-L. "
 
 FreeBSD
 =======

data/ext/oci8/connection_pool.c

@@ -174,9 +174,9 @@ static VALUE oci8_cpool_reinitialize(VALUE self, VALUE conn_min, VALUE conn_max,
  * call-seq:
  *   pool_name -> string
  *
- * <b>internal use only</b>
- *
  * Retruns the pool name.
+ *
+ * @private
  */
 static VALUE oci8_cpool_pool_name(VALUE self)
 {

data/ext/oci8/encoding.c

@@ -185,12 +185,14 @@ static VALUE oci8_charset_name2id(VALUE svc, VALUE name)
  *
  * @return [Fixnum]  NLS ratio
  * @since 2.1.0
+ * @private
  */
 static VALUE oci8_get_nls_ratio(VALUE klass)
 {
     return INT2NUM(oci8_nls_ratio);
 }
 
+#ifndef HAVE_TYPE_RB_ENCODING
 /*
  * call-seq:
  *   OCI8.nls_ratio = integer
@@ -201,6 +203,8 @@ static VALUE oci8_get_nls_ratio(VALUE klass)
  *
  * @param [Fixnum] integer  NLS ratio
  * @since 2.1.0
+ * @private
+ * @note ruby 1.8 only
  */
 static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
 {
@@ -211,6 +215,7 @@ static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
     oci8_nls_ratio = v;
     return val;
 }
+#endif
 
 #ifdef HAVE_TYPE_RB_ENCODING
 
@@ -224,6 +229,7 @@ static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
  * are passed to Oracle, they are converted to +OCI8.encoding+
  * in advance.
  *
+ * @example
  *   # When OCI8.encoding is ISO-8859-1,
  *   conn.exec('insert into country_code values(:1, :2, :3)',
  *             'AT', 'Austria', "\u00d6sterreichs")
@@ -243,6 +249,8 @@ static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
  *
  * @return [Encoding]
  * @since 2.0.0 and ruby 1.9
+ * @private
+ * @see OCI8.client_charset_name
  */
 static VALUE oci8_get_encoding(VALUE klass)
 {
@@ -259,13 +267,16 @@ static VALUE oci8_get_encoding(VALUE klass)
  *
  * @param [Encoding]  enc
  * @since 2.0.0 and ruby 1.9
+ * @private
  */
 static VALUE oci8_set_encoding(VALUE klass, VALUE encoding)
 {
     if (NIL_P(encoding)) {
         oci8_encoding = NULL;
+        oci8_nls_ratio = 1;
     } else {
         oci8_encoding = rb_to_encoding(encoding);
+        oci8_nls_ratio = rb_enc_mbmaxlen(oci8_encoding);
     }
     return encoding;
 }
@@ -287,7 +298,9 @@ void Init_oci8_encoding(VALUE cOCI8)
     rb_define_method(cOCI8, "charset_name2id", oci8_charset_name2id, 1);
     rb_define_method(cOCI8, "charset_id2name", oci8_charset_id2name, 1);
     rb_define_singleton_method(cOCI8, "nls_ratio", oci8_get_nls_ratio, 0);
+#ifndef HAVE_TYPE_RB_ENCODING
     rb_define_singleton_method(cOCI8, "nls_ratio=", oci8_set_nls_ratio, 1);
+#endif
 #ifdef HAVE_TYPE_RB_ENCODING
     rb_define_singleton_method(cOCI8, "encoding", oci8_get_encoding, 0);
     rb_define_singleton_method(cOCI8, "encoding=", oci8_set_encoding, 1);

data/ext/oci8/error.c

@@ -160,31 +160,6 @@ static VALUE set_backtrace(VALUE exc, const char *file, int line)
     return exc;
 }
 
-/*
- * call-seq:
- *    initialize(message, code = nil, sql = nil, parse_error_offset = nil)
- *
- * Creates a new OCIError object.
- *
- * @example
- *   OCIError.new("ORA-00001: unique constraint (%s.%s) violated", 1)
- *   # => #<OCIError: ORA-00001: unique constraint (%s.%s) violated>
- */
-static VALUE oci8_error_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE msg;
-    VALUE code;
-    VALUE sql;
-    VALUE parse_error_offset;
-
-    rb_scan_args(argc, argv, "04", &msg, &code, &sql, &parse_error_offset);
-    rb_call_super(argc > 1 ? 1 : argc, argv);
-    rb_ivar_set(self, oci8_id_at_code, code);
-    rb_ivar_set(self, oci8_id_at_sql, sql);
-    rb_ivar_set(self, oci8_id_at_parse_error_offset, parse_error_offset);
-    return Qnil;
-}
-
 sb4 oci8_get_error_code(OCIError *errhp)
 {
     sb4 errcode = -1;
@@ -214,8 +189,6 @@ void Init_oci8_error(void)
     eOCIContinue = rb_define_class("OCIContinue", eOCIException);
     eOCISuccessWithInfo = rb_define_class("OCISuccessWithInfo", eOCIError);
 
-    rb_define_method(eOCIError, "initialize", oci8_error_initialize, -1);
-
     /*
      * @attr_reader [Integer] code  error code
      */

data/ext/oci8/extconf.rb

@@ -134,14 +134,57 @@ replace_keyword(File.dirname(__FILE__) + '/../../lib/oci8.rb.in', '../../lib/oci
 ruby_engine = (defined? RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 
 so_basename = 'oci8lib_'
-if ruby_engine == 'ruby'
-  # Config::CONFIG["ruby_version"] indicates the ruby API version.
-  #  1.8   - ruby 1.8.x
-  #  1.9.1 - ruby 1.9.1, 1.9.2
-  #  2.0.0 - ruby 2.0.0
-  so_basename += RbConfig::CONFIG["ruby_version"].gsub(/\W/, '')
+case ruby_engine
+when 'ruby'
+  # The extension library name includes the ruby ABI (application binary interface)
+  # version. It is for binary gems which contain more than one extension library
+  # and use correct one depending on the ABI version.
+  #
+  #  ruby version |  ABI version
+  # --------------+--------------
+  #    1.8.6      |   1.8
+  #    1.8.7      |   1.8
+  # --------------+--------------
+  #    1.9.0      |   1.9.0
+  #    1.9.1      |   1.9.1
+  #    1.9.2      |   1.9.1
+  #    1.9.3      |   1.9.1
+  # --------------+--------------
+  #    2.0.0      |   2.0.0
+  #    2.0.1      |   2.0.1  (See: [ruby-core:49578])
+  #     ...       |    ...
+  #
+  # Note: The ruby ABI version is same with RbConfig::CONFIG['ruby_version']
+  # if it wasn't explicitly changed by the configure option --with-ruby-version.
+  #
+  case RUBY_VERSION
+  when /^2\.0/
+    so_basename += RUBY_VERSION.gsub(/\W/, '')
+  when /^1\.9\.0/
+    raise 'unsupported ruby version: 1.9.0'
+  when /^1\.9/
+    so_basename += '191'
+  when /^1\.8/
+    so_basename += '18'
+  else
+    raise 'unsupported ruby version: ' + RUBY_VERSION
+  end
+when 'rbx'
+  # "rbx -X18" and "rbx -X19" use different C header files.
+  case RUBY_VERSION
+  when /^2\.0/
+    so_basename += 'rbx20'
+  when /^1\.9/
+    so_basename += 'rbx19'
+  when /^1\.8/
+    so_basename += 'rbx18'
+  else
+    raise 'unsupported language mode: ' + RUBY_VERSION
+  end
+when 'jruby'
+  raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
 else
-  so_basename += ruby_engine
+  raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
 
 $defs << "-DInit_oci8lib=Init_#{so_basename}"

data/ext/oci8/lob.c

@@ -554,12 +554,24 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
         /* initialize buf in zeros everytime to check a nul characters. */
         memset(buf, 0, sizeof(buf));
         rv = OCILobRead_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, buf, sizeof(buf), NULL, NULL, 0, lob->csfrm);
-        if (rv == OCI_ERROR && oci8_get_error_code(oci8_errhp) == 22289) {
-            /* ORA-22289: cannot perform FILEREAD operation on an unopened file or LOB */
-            if (lob->state == S_BFILE_CLOSE)
-                continue;
-        }
-        if (rv != OCI_SUCCESS && rv != OCI_NEED_DATA) {
+        svcctx->suppress_free_temp_lobs = 0;
+        switch (rv) {
+        case OCI_SUCCESS:
+            break;
+        case OCI_NEED_DATA:
+            /* prevent OCILobFreeTemporary() from being called.
+             * See: https://github.com/kubo/ruby-oci8/issues/20
+             */
+            svcctx->suppress_free_temp_lobs = 1;
+            break;
+        case OCI_ERROR:
+            if (oci8_get_error_code(oci8_errhp) == 22289) {
+                /* ORA-22289: cannot perform FILEREAD operation on an unopened file or LOB */
+                if (lob->state == S_BFILE_CLOSE)
+                    continue;
+            }
+            /* FALLTHROUGH */
+        default:
             chker2(rv, &svcctx->base);
         }
 

data/ext/oci8/metadata.c

@@ -159,6 +159,19 @@ static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype,
     return oci8_metadata_create(parmhp, self, obj);
 }
 
+/*
+ * call-seq:
+ *   __describe(name, klass, check_public)
+ *
+ * @param [String] name  object name
+ * @param [subclass of OCI8::Metadata::Base] klass
+ * @param [Boolean] check_public  +true+ to look up the object as a public synonym when
+ *                                the object does not exist in the current schema and
+ *                                the name includes no dots.
+ * @return [subclass of OCI8::Metadata::Base]
+ *
+ * @private
+ */
 static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_public)
 {
     OCI8SafeStringValue(name);

data/ext/oci8/oci8.c

@@ -2,7 +2,7 @@
 /*
  * oci8.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2011 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2013 KUBO Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -171,25 +171,56 @@ static VALUE oci8_s_oracle_client_vernum(VALUE klass)
     return oracle_client_vernum;
 }
 
-static VALUE oci8_s_set_property(VALUE klass, VALUE name, VALUE val)
+/*
+ * call-seq:
+ *   OCI8.__get_prop(key)
+ *
+ * @param [Fixnum] key    1 or 2
+ *
+ * @private
+ */
+static VALUE oci8_s_get_prop(VALUE klass, VALUE key)
 {
-    const char *name_str;
-
-    Check_Type(name, T_SYMBOL);
-    name_str = rb_id2name(SYM2ID(name));
-    if (strcmp(name_str, "float_conversion_type") == 0) {
-        const char *val_str;
-        Check_Type(val, T_SYMBOL);
-        val_str = rb_id2name(SYM2ID(val));
-        if (strcmp(val_str, "ruby") == 0) {
-            oci8_float_conversion_type_is_ruby = 1;
-        } else if (strcmp(val_str, "oracle") == 0) {
-            oci8_float_conversion_type_is_ruby = 0;
-        } else {
-            rb_raise(rb_eArgError, "float_conversion_type's value should be either :ruby or :oracle.");
+    switch (NUM2INT(key)) {
+    case 1:
+        return oci8_float_conversion_type_is_ruby ? Qtrue : Qfalse;
+    case 2:
+        return UINT2NUM(oci8_env_mode);
+    default:
+        rb_raise(rb_eArgError, "Unknown prop %d", NUM2INT(key));
+    }
+}
+
+
+/*
+ * call-seq:
+ *   OCI8.__set_prop(key, value)
+ *
+ * @param [Fixnum] key    1 or 2
+ * @param [Object] value  depends on +key+.
+ *
+ * @private
+ */
+static VALUE oci8_s_set_prop(VALUE klass, VALUE key, VALUE val)
+{
+    switch (NUM2INT(key)) {
+    case 1:
+        oci8_float_conversion_type_is_ruby = RTEST(val) ? 1 : 0;
+        break;
+    case 2:
+        /*
+         * Changes the OCI environment mode which will be passed to the second
+         * argument of the OCI function OCIEnvCreate.
+         */
+        if (oci8_global_envhp != NULL) {
+            rb_raise(rb_eRuntimeError, "The OCI Environment has been alreadly initialized. It cannot be changed after even one OCI function is called.");
         }
+        oci8_env_mode = NUM2UINT(val);
+        break;
+    default:
+        rb_raise(rb_eArgError, "Unknown prop %d", NUM2INT(key));
     }
-    return Qnil;
+    return klass;
 }
 
 /*
@@ -254,6 +285,7 @@ void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pass, VALU
  *   "scott/tiger@oradb.example.com" -> ["scott", "tiger", "oradb.example.com", nil]
  *   "sys/change_on_install as sysdba" -> ["sys", "change_on_install", nil, :SYSDBA]
  *
+ * @private
  */
 static VALUE oci8_parse_connect_string(VALUE self, VALUE conn_str)
 {
@@ -365,9 +397,9 @@ static const oci8_logoff_strategy_t complex_logoff = {
  * call-seq:
  *   logon2(username, password, dbname, mode) -> connection
  *
- * <b>internal use only</b>
- *
  * Creates a simple logon session by the OCI function OCILogon2().
+ *
+ * @private
  */
 static VALUE oci8_logon2(VALUE self, VALUE username, VALUE password, VALUE dbname, VALUE mode)
 {
@@ -417,10 +449,10 @@ static VALUE oci8_logon2(VALUE self, VALUE username, VALUE password, VALUE dbnam
  * call-seq:
  *   allocate_handles()
  *
- * <b>internal use only</b>
- *
  * Allocates a service context handle, a session handle and a
  * server handle to use explicit attach and begin-session calls.
+ *
+ * @private
  */
 static VALUE oci8_allocate_handles(VALUE self)
 {
@@ -457,9 +489,9 @@ static VALUE oci8_allocate_handles(VALUE self)
  * call-seq:
  *   server_attach(dbname, mode)
  *
- * <b>internal use only</b>
- *
  * Attachs to the server by the OCI function OCIServerAttach().
+ *
+ * @private
  */
 static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
 {
@@ -499,9 +531,9 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
  * call-seq:
  *   session_begin(cred, mode)
  *
- * <b>internal use only</b>
- *
  * Begins the session by the OCI function OCISessionBegin().
+ *
+ * @private
  */
 static VALUE oci8_session_begin(VALUE self, VALUE cred, VALUE mode)
 {
@@ -767,9 +799,9 @@ static VALUE oci8_set_prefetch_rows(VALUE self, VALUE val)
  *
  * Returns a numerical format of the Oracle server version.
  *
- * See also: #oracle_server_version
- *
+ * @see OCI8#oracle_server_version
  * @since 2.0.1
+ * @private
  */
 static VALUE oci8_oracle_server_vernum(VALUE self)
 {
@@ -1121,7 +1153,8 @@ void Init_oci8(VALUE *out)
 
     rb_define_const(cOCI8, "VERSION", rb_obj_freeze(rb_usascii_str_new_cstr(OCI8LIB_VERSION)));
     rb_define_singleton_method_nodoc(cOCI8, "oracle_client_vernum", oci8_s_oracle_client_vernum, 0);
-    rb_define_singleton_method_nodoc(cOCI8, "__set_property", oci8_s_set_property, 2);
+    rb_define_singleton_method(cOCI8, "__get_prop", oci8_s_get_prop, 1);
+    rb_define_singleton_method(cOCI8, "__set_prop", oci8_s_set_prop, 2);
     rb_define_singleton_method(cOCI8, "error_message", oci8_s_error_message, 1);
     rb_define_private_method(cOCI8, "parse_connect_string", oci8_parse_connect_string, 1);
     rb_define_private_method(cOCI8, "logon2", oci8_logon2, 4);
@@ -1145,7 +1178,6 @@ void Init_oci8(VALUE *out)
     rb_define_method(cOCI8, "module=", oci8_set_module, 1);
     rb_define_method(cOCI8, "action=", oci8_set_action, 1);
     rb_define_method(cOCI8, "client_info=", oci8_set_client_info, 1);
-    rb_define_attr(cOCI8, "last_error", 1, 1);
     *out = cOCI8;
 }
 

data/ext/oci8/oci8.h

@@ -361,6 +361,7 @@ typedef struct oci8_svcctx {
     rb_pid_t pid;
     unsigned char state;
     char is_autocommit;
+    char suppress_free_temp_lobs;
 #ifdef NATIVE_THREAD_WITH_GVL
     char non_blocking;
 #endif

data/ext/oci8/oci8lib.c

@@ -229,44 +229,45 @@ static void *free_temp_lob(void *user_data)
 /* ruby 1.9 */
 sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *data)
 {
-    oci8_temp_lob_t *lob;
     OCIError *errhp = oci8_errhp;
 
     if (!NIL_P(svcctx->executing_thread)) {
         rb_raise(rb_eRuntimeError /* FIXME */, "executing in another thread");
     }
 
-    lob = svcctx->temp_lobs;
-    while (lob != NULL) {
-        oci8_temp_lob_t *lob_next = lob->next;
+    if (!svcctx->suppress_free_temp_lobs) {
+        oci8_temp_lob_t *lob = svcctx->temp_lobs;
+        while (lob != NULL) {
+            oci8_temp_lob_t *lob_next = lob->next;
 
-        if (svcctx->non_blocking) {
-            free_temp_lob_arg_t arg;
-            sword rv;
+            if (svcctx->non_blocking) {
+                free_temp_lob_arg_t arg;
+                sword rv;
 
-            arg.svcctx = svcctx;
-            arg.svchp = svcctx->base.hp.svc;
-            arg.errhp = errhp;
-            arg.lob = lob->lob;
+                arg.svcctx = svcctx;
+                arg.svchp = svcctx->base.hp.svc;
+                arg.errhp = errhp;
+                arg.lob = lob->lob;
 
-            svcctx->executing_thread = rb_thread_current();
+                svcctx->executing_thread = rb_thread_current();
 #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-            rv = (sword)(VALUE)rb_thread_call_without_gvl(free_temp_lob, &arg, oci8_unblock_func, svcctx);
+                rv = (sword)(VALUE)rb_thread_call_without_gvl(free_temp_lob, &arg, oci8_unblock_func, svcctx);
 #else
-            rv = (sword)rb_thread_blocking_region((VALUE(*)(void*))free_temp_lob, &arg, oci8_unblock_func, svcctx);
+                rv = (sword)rb_thread_blocking_region((VALUE(*)(void*))free_temp_lob, &arg, oci8_unblock_func, svcctx);
 #endif
-            if (rv == OCI_ERROR) {
-                if (oci8_get_error_code(errhp) == 1013) {
-                    rb_raise(eOCIBreak, "Canceled by user request.");
+                if (rv == OCI_ERROR) {
+                    if (oci8_get_error_code(errhp) == 1013) {
+                        rb_raise(eOCIBreak, "Canceled by user request.");
+                    }
                 }
+            } else {
+                OCILobFreeTemporary(svcctx->base.hp.svc, errhp, lob->lob);
             }
-        } else {
-            OCILobFreeTemporary(svcctx->base.hp.svc, errhp, lob->lob);
-        }
-        OCIDescriptorFree(lob->lob, OCI_DTYPE_LOB);
+            OCIDescriptorFree(lob->lob, OCI_DTYPE_LOB);
 
-        xfree(lob);
-        svcctx->temp_lobs = lob = lob_next;
+            xfree(lob);
+            svcctx->temp_lobs = lob = lob_next;
+        }
     }
 
     if (svcctx->non_blocking) {

data/ext/oci8/oraconf.rb

@@ -1,3 +1,4 @@
+# coding: ascii
 require 'mkmf'
 
 # compatibility for ruby-1.9

data/lib/oci8.rb.in

@@ -26,14 +26,34 @@ end
 ruby_engine = (defined? RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 
 so_basename = 'oci8lib_'
-if ruby_engine == 'ruby'
-  # The suffix number indicates the ruby API version.
-  #  1.8   - ruby 1.8.x
-  #  1.9.1 - ruby 1.9.1, 1.9.2
-  #  2.0.0 - ruby 2.0.0-dev at the present time.
+case ruby_engine
+when 'ruby'
+  # The extension library name includes the ruby ABI (application binary interface)
+  # version. It is for binary gems which contain more than one extension library
+  # and use correct one depending on the ABI version.
+  #
+  #  ruby version |  ABI version
+  # --------------+--------------
+  #    1.8.6      |   1.8
+  #    1.8.7      |   1.8
+  # --------------+--------------
+  #    1.9.0      |   1.9.0
+  #    1.9.1      |   1.9.1
+  #    1.9.2      |   1.9.1
+  #    1.9.3      |   1.9.1
+  # --------------+--------------
+  #    2.0.0      |   2.0.0
+  #    2.0.1      |   2.0.1  (See: [ruby-core:49578])
+  #     ...       |    ...
+  #
+  # Note: The ruby ABI version is same with RbConfig::CONFIG['ruby_version']
+  # if it wasn't explicitly changed by the configure option --with-ruby-version.
+  #
   case RUBY_VERSION
   when /^2\.0/
-    so_basename += '200'
+    so_basename += RUBY_VERSION.gsub(/\W/, '')
+  when /^1\.9\.0/
+    raise 'unsupported ruby version: 1.9.0'
   when /^1\.9/
     so_basename += '191'
   when /^1\.8/
@@ -41,8 +61,22 @@ if ruby_engine == 'ruby'
   else
     raise 'unsupported ruby version: ' + RUBY_VERSION
   end
+when 'rbx'
+  # "rbx -X18" and "rbx -X19" use different C header files.
+  case RUBY_VERSION
+  when /^2\.0/
+    so_basename += 'rbx20'
+  when /^1\.9/
+    so_basename += 'rbx19'
+  when /^1\.8/
+    so_basename += 'rbx18'
+  else
+    raise 'unsupported language mode: ' + RUBY_VERSION
+  end
+when 'jruby'
+  raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
 else
-  so_basename += ruby_engine
+  raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
 require so_basename
 
@@ -89,6 +123,7 @@ class OCI8
   # OCIClientVersion().
   #
   # @return [OCI8::OracleVersion] Oracle client version
+  # @see OCI8#oracle_server_version
   def self.oracle_client_version
     @@oracle_client_version
   end

data/lib/oci8/encoding-init.rb

@@ -39,26 +39,6 @@ class OCI8
     @@client_charset_name = 'US7ASCII'
   end
 
-  # NLS ratio, maximum number of bytes per one chracter
-  case @@client_charset_name
-  when 'UTF8'
-    OCI8.nls_ratio = 3
-  when 'AL16UTF16'
-    OCI8.nls_ratio = 4
-  when /^[[:alpha:]]+(\d+)/
-    # convert maximum number of bits per one chracter to NLS ratio.
-    #   charset name  max bits  max bytes
-    #   ------------  --------  ---------
-    #   US7ASCII          7         1
-    #   WE8ISO8859P1      8         1
-    #   JA16SJIS         16         2
-    #   AL32UTF8         32         4
-    #   ...
-    OCI8.nls_ratio = (($1.to_i + 7) >> 3)
-  else
-    raise "Unknown NLS character set name format: #{@@client_charset_name}"
-  end
-
   # Ruby encoding name for ruby 1.9.
   if OCI8.respond_to? :encoding
     if defined? DEFAULT_OCI8_ENCODING
@@ -75,5 +55,25 @@ class OCI8
       end
     end
     OCI8.encoding = enc
+  else
+    # NLS ratio, maximum number of bytes per one chracter
+    case @@client_charset_name
+    when 'UTF8'
+      OCI8.nls_ratio = 3
+    when 'AL16UTF16'
+      OCI8.nls_ratio = 4
+    when /^[[:alpha:]]+(\d+)/
+      # convert maximum number of bits per one chracter to NLS ratio.
+      #   charset name  max bits  max bytes
+      #   ------------  --------  ---------
+      #   US7ASCII          7         1
+      #   WE8ISO8859P1      8         1
+      #   JA16SJIS         16         2
+      #   AL32UTF8         32         4
+      #   ...
+      OCI8.nls_ratio = (($1.to_i + 7) >> 3)
+    else
+      raise "Unknown NLS character set name format: #{@@client_charset_name}"
+    end
   end
 end

data/lib/oci8/metadata.rb

@@ -1985,72 +1985,115 @@ class OCI8
 =end
   end # OCI8::Metadata
 
-  # return a subclass of OCI8::Metadata::Base
-  # which has information about _object_name_.
-  # OCI8::Metadata::Table, OCI8::Metadata::View,
-  # OCI8::Metadata::Procedure, OCI8::Metadata::Function,
-  # OCI8::Metadata::Package, OCI8::Metadata::Type,
-  # OCI8::Metadata::Synonym or OCI8::Metadata::Sequence
+  # Returns object information.
+  #
+  # The return type is depends on the object type.
+  #
+  # Oracle type:: Ruby type
+  # Table::       {OCI8::Metadata::Table}
+  # View::        {OCI8::Metadata::View}
+  # Procedure::   {OCI8::Metadata::Procedure}
+  # Function::    {OCI8::Metadata::Function}
+  # Package::     {OCI8::Metadata::Package}
+  # Type::        {OCI8::Metadata::Type}
+  # Synonym::     {OCI8::Metadata::Synonym}
+  # Sequence::    {OCI8::Metadata::Sequence}
+  #
+  # @param [String] object_name
+  # @return [a subclass of OCI8::Metadata::Base]
   def describe_any(object_name)
     __describe(object_name, OCI8::Metadata::Unknown, true)
   end
-  # returns a OCI8::Metadata::Table or a OCI8::Metadata::View. If the
-  # name is a current schema's synonym name or a public synonym name,
-  # it returns a OCI8::Metadata::Table or a OCI8::Metadata::View which
+  # Returns table or view information. If the name is a current schema's synonym
+  # name or a public synonym name, it returns table or view information which
   # the synonym refers.
   #
-  # If the second argument is true, this returns a
-  # OCI8::Metadata::Table in the current schema.
+  # If +table_only+ is true, it checks tables in the current schema.
+  #
+  # @param [String] table_name
+  # @param [Boolean] table_only (default: false)
+  # @return [OCI8::Metadata::Table or OCI8::Metadata::View]
   def describe_table(table_name, table_only = false)
     if table_only
       # check my own tables only.
       __describe(table_name, OCI8::Metadata::Table, false)
     else
       # check tables, views, synonyms and public synonyms.
-      metadata = __describe(table_name, OCI8::Metadata::Unknown, true)
-      case metadata
-      when OCI8::Metadata::Table, OCI8::Metadata::View
-        metadata
-      when OCI8::Metadata::Synonym
-        describe_table(metadata.translated_name)
-      else
-        raise OCIError.new("ORA-04043: object #{table_name} does not exist", 4043)
+      recursive_level = 20
+      recursive_level.times do
+        metadata = __describe(table_name, OCI8::Metadata::Unknown, true)
+        case metadata
+        when OCI8::Metadata::Table, OCI8::Metadata::View
+          return metadata
+        when OCI8::Metadata::Synonym
+          table_name = metadata.translated_name
+        else
+          raise OCIError.new(4043, table_name) # ORA-04043: object %s does not exist
+        end
       end
+      raise OCIError.new(36, recursive_level) # ORA-00036: maximum number of recursive SQL levels (%s) exceeded
     end
   end
-  # returns a OCI8::Metadata::View in the current schema.
+  # Returns view information
+  #
+  # @param [String] view_name
+  # @return [OCI8::Metadata::View]
   def describe_view(view_name)
     __describe(view_name, OCI8::Metadata::View, false)
   end
-  # returns a OCI8::Metadata::Procedure in the current schema.
+  # Returns procedure information
+  #
+  # @param [String] procedure_name
+  # @return [OCI8::Metadata::Procedure]
   def describe_procedure(procedure_name)
     __describe(procedure_name, OCI8::Metadata::Procedure, false)
   end
-  # returns a OCI8::Metadata::Function in the current schema.
+  # Returns function information
+  #
+  # @param [String] function_name
+  # @return [OCI8::Metadata::Function]
   def describe_function(function_name)
     __describe(function_name, OCI8::Metadata::Function, false)
   end
-  # returns a OCI8::Metadata::Package in the current schema.
+  # Returns package information
+  #
+  # @param [String] package_name
+  # @return [OCI8::Metadata::Package]
   def describe_package(package_name)
     __describe(package_name, OCI8::Metadata::Package, false)
   end
-  # returns a OCI8::Metadata::Type in the current schema.
+  # Returns type information
+  #
+  # @param [String] type_name
+  # @return [OCI8::Metadata::Type]
   def describe_type(type_name)
     __describe(type_name, OCI8::Metadata::Type, false)
   end
-  # returns a OCI8::Metadata::Synonym in the current schema.
+  # Returns synonym information
+  #
+  # @param [String] synonym_name
+  # @return [OCI8::Metadata::Synonym]
   def describe_synonym(synonym_name, check_public_also = true)
     __describe(synonym_name, OCI8::Metadata::Synonym, check_public_also)
   end
-  # returns a OCI8::Metadata::Sequence in the current schema.
+  # Returns sequence information
+  #
+  # @param [String] sequence_name
+  # @return [OCI8::Metadata::Sequence]
   def describe_sequence(sequence_name)
     __describe(sequence_name, OCI8::Metadata::Sequence, false)
   end
-  # returns a OCI8::Metadata::Schema in the database.
+  # Returns schema information
+  #
+  # @param [String] schema_name
+  # @return [OCI8::Metadata::Schema]
   def describe_schema(schema_name)
     __describe(schema_name, OCI8::Metadata::Schema, false)
   end
-  # returns a OCI8::Metadata::Database.
+  # Returns database information
+  #
+  # @param [String] database_name
+  # @return [OCI8::Metadata::Database]
   def describe_database(database_name)
     __describe(database_name, OCI8::Metadata::Database, false)
   end

data/lib/oci8/oci8.rb

@@ -26,8 +26,10 @@ require 'yaml'
 #              value_for_the_second_parameter)
 class OCI8
 
-  # call-seq:
-  #   new(username, password, dbname = nil, privilege = nil)
+  # @return [OCIError]
+  attr_accessor :last_error
+
+  # @overload initialize(username, password, dbname = nil, privilege = nil)
   #
   # Connects to an Oracle database server by +username+ and +password+
   # at +dbname+ as +privilege+.
@@ -337,14 +339,14 @@ class OCI8
     end
   end
 
+  # @private
   def inspect
     "#<OCI8:#{username}>"
   end
 
-  # Returns an OCI8::OracleVersion of the Oracle server version.
-  #
-  # See also: OCI8.oracle_client_version
+  # Returns the Oracle server version.
   #
+  # @see OCI8.oracle_client_version
   # @return [OCI8::OracleVersion]
   def oracle_server_version
     unless defined? @oracle_server_version
@@ -365,7 +367,7 @@ class OCI8
     @oracle_server_version
   end
 
-  # Returns the Oracle database character set name.
+  # Returns the Oracle database character set name such as AL32UTF8.
   #
   # @since 2.1.0
   # @return [String] Oracle database character set name
@@ -373,15 +375,74 @@ class OCI8
     charset_id2name(@server_handle.send(:attr_get_ub2, OCI_ATTR_CHARSET_ID))
   end
 
-  # Returns the client-side Oracle character set name.
+  # Returns the client-side Oracle character set name such as AL32UTF8.
   #
   # @since 2.1.0
   # @return [String] client-side character set name
+  # @private
+  # @see OCI8.encoding
   def self.client_charset_name
     @@client_charset_name
   end
 end
 
+class OCIError
+
+  # @overload initialize(message, error_code = nil, sql_stmt = nil, parse_error_offset = nil)
+  #   Creates a new OCIError object with specified parameters.
+  #
+  #   @param [String]   message    error message
+  #   @param [Integer]  error_code Oracle error code
+  #   @param [String]   sql_stmt   SQL statement
+  #   @param [Integer]  parse_error_offset
+  #
+  #   @example
+  #     OCIError.new("ORA-00001: unique constraint (%s.%s) violated", 1, 'insert into table_name values (1)', )
+  #     # => #<OCIError: ORA-00001: unique constraint (%s.%s) violated>
+  #     #<OCIError: ORA-00923: FROM keyword not found where expected>
+  #     "select sysdate"
+  #     923
+  #     14
+  #
+  # @overload initialize(error_code, *params)
+  #   Creates a new OCIError object with the error message which corresponds to the specified
+  #   Oracle error code.
+  #
+  #   @param [Integer]  error_code  Oracle error code
+  #   @param [String, ...] params   parameters which replace '%s'
+  #
+  #   @example
+  #     # without parameters
+  #     OCIError.new(4043)
+  #     # When NLS_LANG=american_america.AL32UTF8
+  #     # => #<OCIError: ORA-04043: object %s does not exist>
+  #     # When NLS_LANG=german_germany.AL32UTF8
+  #     # => #<OCIError: ORA-04043: Objekt %s ist nicht vorhanden>
+  #     
+  #     # with one parameter
+  #     OCIError.new(4043, 'table_name')
+  #     # When NLS_LANG=american_america.AL32UTF8
+  #     # => #<OCIError: ORA-04043: object table_name does not exist>
+  #     # When NLS_LANG=german_germany.AL32UTF8
+  #     # => #<OCIError: ORA-04043: Objekt table_name ist nicht vorhanden>
+  #
+  def initialize(*args)
+    if args.length > 0
+      if args[0].is_a? Fixnum
+        @code = args.shift
+        super(OCI8.error_message(@code).gsub('%s') {|s| args.empty? ? '%s' : args.shift})
+        @sql = nil
+        @parse_error_offset = nil
+      else
+        msg, @code, @sql, @parse_error_offset = args
+        super(msg)
+      end
+    else
+      super()
+    end
+  end
+end
+
 class OraDate
 
   # Returns a Time object which denotes self.

data/lib/oci8/oracle_version.rb

@@ -122,7 +122,7 @@ class OCI8
     #   oraver = OCI8::OracleVersion.new('11.2.0.3')
     #   oraver.to_s          # => '11.2.0.3.0'
     #
-    # @return [Integer]
+    # @return [String]
     def to_s
       format('%d.%d.%d.%d.%d', @major, @minor, @update, @patch, @port_update)
     end

data/lib/oci8/properties.rb

@@ -1,26 +1,30 @@
 # properties.rb -- implements OCI8.properties
 #
-# Copyright (C) 2010-2012 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2010-2013 KUBO Takehiro <kubo@jiubao.org>
 
 #
 class OCI8
 
+  # @private
   @@properties = {
     :length_semantics => :byte,
     :bind_string_as_nchar => false,
-    :float_conversion_type => :ruby,
+    :float_conversion_type => OCI8.__get_prop(1) ? :ruby : :oracle,
     :statement_cache_size => 0,
+    :events_mode => ((OCI8.__get_prop(2) & 4) != 0) # 4 <- OCI_EVENTS in oci.h
   }
 
   if OCI8.oracle_client_version < OCI8::ORAVER_9_2
     @@properties[:statement_cache_size] = nil
   end
 
+  # @private
   def @@properties.[](name)
     raise IndexError, "No such property name: #{name}" unless @@properties.has_key?(name)
     super(name)
   end
 
+  # @private
   def @@properties.[]=(name, val)
     raise IndexError, "No such property name: #{name}" unless @@properties.has_key?(name)
     case name
@@ -31,23 +35,31 @@ class OCI8
     when :bind_string_as_nchar
       val = val ? true : false
     when :float_conversion_type
-      # handled by native code in oci8lib_xx.so.
-      OCI8.__set_property(name, val)
+      case val
+      when :ruby
+        OCI8.__set_prop(1, true)
+      when :oracle
+        OCI8.__set_prop(1, false)
+      else
+        raise ArgumentError, "float_conversion_type's value should be either :ruby or :oracle."
+      end
     when :statement_cache_size
       if OCI8.oracle_client_version < OCI8::ORAVER_9_2
         raise RuntimeError, ":statement_cache_size is disabled on Oracle 9iR1 client."
       end
       val = val.to_i
       raise ArgumentError, "The property value for :statement_cache_size must not be negative." if val < 0
+    when :events_mode
+      val = val ? true : false
+      if val
+        OCI8.__set_prop(2, OCI8.__get_prop(2) | 4) # set OCI_EVENTS
+      else
+        OCI8.__set_prop(2, OCI8.__get_prop(2) & ~4) # unset OCI_EVENTS
+      end
     end
     super(name, val)
   end
 
-  # call-seq:
-  #   OCI8.properties -> a customized Hash
-  #
-  # (new in 2.0.5)
-  #
   # Returns a Hash which ruby-oci8 global settings.
   # The hash's setter and getter methods are customized to check
   # property names and values.
@@ -63,19 +75,20 @@ class OCI8
   # Supported properties are listed below:
   #
   # [:length_semantics]
-  #     (new in 2.1.0)
   #     
   #     +:char+ when Oracle character length is counted by the number of characters.
   #     +:byte+ when it is counted by the number of bytes.
   #     The default setting is +:byte+ because +:char+ causes unexpected behaviour on
   #     Oracle 9i.
+  #     
+  #     *Since:* 2.1.0
   #
   # [:bind_string_as_nchar]
+  #     
   #     +true+ when string bind variables are bound as NCHAR,
   #     otherwise +false+. The default value is +false+.
   #
   # [:float_conversion_type]
-  #     (new in 2.1.0)
   #     
   #     +:ruby+ when Oracle decimal numbers are converted to ruby Float values
   #     same as Float#to_s does. (default)
@@ -85,14 +98,35 @@ class OCI8
   #     the Oracle function OCINumberToReal() makes a string representation
   #     15.700000000000001 by Float#to_s.
   #     See: http://rubyforge.org/forum/forum.php?thread_id=50030&forum_id=1078
+  #     
+  #     *Since:* 2.1.0
   #
   # [:statement_cache_size]
-  #     (new in 2.1.1)
   #     
   #     The statement cache size per each session. The default size is 0, which
   #     means no statement cache, since 2.1.2. It was 20 in 2.1.1.
   #     This feature is available on Oracle 9iR2 or later.
   #     See: http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/oci09adv.htm#i471377
+  #     
+  #     *Since:* 2.1.1
+  #
+  # [:events_mode]
+  #     
+  #     +true+ when Fast Application Notification (FAN) Support is enabled.
+  #     +false+ when it is disabled. The default value is +false+.
+  #     This corresponds to {http://php.net/manual/en/oci8.configuration.php#ini.oci8.events +oci8.events+ in PHP}.
+  #     
+  #     This parameter can be changed only when no OCI methods are called.
+  #     
+  #       require 'oci8'
+  #       OCI8.properties[:events_mode] = true # works fine.
+  #       ... call some OCI methods ...
+  #       OCI8.properties[:events_mode] = true # raises a runtime error.
+  #     
+  #     *Since:* 2.1.4
+  #
+  # @return [a customized Hash]
+  # @since 2.0.5
   #
   def self.properties
     @@properties

data/test/test_clob.rb

@@ -75,6 +75,22 @@ class TestCLob < Test::Unit::TestCase
     lob.close
   end
 
+  # https://github.com/kubo/ruby-oci8/issues/20
+  def test_github_issue_20
+    lob1 = OCI8::CLOB.new(@conn, ' '  * (1024 * 1024))
+    begin
+      lob2 = OCI8::CLOB.new(@conn, ' '  * (128 * 1024 * 1024))
+    rescue OCIError
+      raise if $!.code != 24817
+      # ORA-24817: Unable to allocate the given chunk for current lob operation
+      GC.start
+      # allocate smaller size
+      lob2 = OCI8::CLOB.new(@conn, ' '  * (16 * 1024 * 1024))
+    end
+    lob1 = nil  # lob1's value will be freed in GC.
+    lob2.read   # GC must run here to reproduce the issue.
+  end
+
   def teardown
     drop_table('test_table')
     @conn.logoff

data/test/test_encoding.rb

@@ -25,7 +25,7 @@ STORAGE (
    MAXEXTENTS UNLIMITED
    PCTINCREASE 0)
 EOS
-    ascii_8bit = Encoding.find('ASCII-8BIT')
+    ascii_8bit = "\xab\xcd".force_encoding('ASCII-8BIT')
     @conn.exec(<<EOS)
 INSERT INTO test_table VALUES ('abcd', 'abcd', 'abcd', 'abcd', 'abcd', 'abcd', 'abcd')
 EOS
@@ -34,16 +34,16 @@ EOS
       assert_equal(OCI8.encoding, row[0].encoding);
       assert_equal('abcd', row[1], 'VARCHAR2(10)')
       assert_equal(OCI8.encoding, row[1].encoding);
-      assert_equal("\xab\xcd", row[2], 'RAW(10)')
-      assert_equal(ascii_8bit, row[2].encoding);
-      assert_equal("\xab\xcd", row[3], 'LONG RAW')
-      assert_equal(ascii_8bit, row[3].encoding);
+      assert_equal(ascii_8bit, row[2], 'RAW(10)')
+      assert_equal(ascii_8bit.encoding, row[2].encoding);
+      assert_equal(ascii_8bit, row[3], 'LONG RAW')
+      assert_equal(ascii_8bit.encoding, row[3].encoding);
       assert_equal('abcd', (data = row[4].read), 'CLOB')
       assert_equal(OCI8.encoding, data.encoding);
       assert_equal('abcd', (data = row[5].read), 'NCLOB')
       assert_equal(OCI8.encoding, data.encoding);
-      assert_equal("\xab\xcd", (data = row[6].read), 'BLOB')
-      assert_equal(ascii_8bit, data.encoding);
+      assert_equal(ascii_8bit, (data = row[6].read), 'BLOB')
+      assert_equal(ascii_8bit.encoding, data.encoding);
 
       if OCI8.encoding.name == "UTF-8" and ['WE8ISO8859P1', 'WE8ISO8859P15', 'AL32UTF8', 'UTF8'].include? @conn.database_charset_name
         utf_8 = "\u00A1\u00A2\u00A3\u00A5\u00A7\u00A9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
   with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-oci8
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API