ruby-oci8 2.1.2 → 2.1.3

data/ext/oci8/bind.c

@@ -206,7 +206,7 @@ static VALUE oci8_bind_get(VALUE self)
     return vptr->get(obind, (void*)((size_t)obind->valuep + obind->alloc_sz * idx), null_structp);
 }
 
-VALUE oci8_bind_get_data(VALUE self)
+static VALUE oci8_bind_get_data(VALUE self)
 {
     oci8_bind_t *obind = DATA_PTR(self);
 
@@ -252,7 +252,7 @@ static VALUE oci8_bind_set(VALUE self, VALUE val)
     return self;
 }
 
-void oci8_bind_set_data(VALUE self, VALUE val)
+static VALUE oci8_bind_set_data(VALUE self, VALUE val)
 {
     oci8_bind_t *obind = DATA_PTR(self);
 
@@ -274,6 +274,7 @@ void oci8_bind_set_data(VALUE self, VALUE val)
         }
         obind->curar_sz = size;
     }
+    return self;
 }
 
 static VALUE oci8_bind_initialize(VALUE self, VALUE svc, VALUE val, VALUE length, VALUE max_array_size)
@@ -349,6 +350,8 @@ void Init_oci8_bind(VALUE klass)
     rb_define_method(cOCI8BindTypeBase, "initialize", oci8_bind_initialize, 4);
     rb_define_method(cOCI8BindTypeBase, "get", oci8_bind_get, 0);
     rb_define_method(cOCI8BindTypeBase, "set", oci8_bind_set, 1);
+    rb_define_private_method(cOCI8BindTypeBase, "get_data", oci8_bind_get_data, 0);
+    rb_define_private_method(cOCI8BindTypeBase, "set_data", oci8_bind_set_data, 1);
 
     /* register primitive data types. */
     oci8_define_bind_class("String", &bind_string_vtable);

data/ext/oci8/connection_pool.c

@@ -21,11 +21,11 @@ static void oci8_cpool_mark(oci8_base_t *base)
     rb_gc_mark(cpool->pool_name);
 }
 
-static VALUE cpool_free_thread(void *arg)
+static void *cpool_free_thread(void *arg)
 {
     OCIConnectionPoolDestroy((OCICPool *)arg, oci8_errhp, OCI_DEFAULT);
     OCIHandleFree(arg, OCI_HTYPE_CPOOL);
-    return 0;
+    return NULL;
 }
 
 static void oci8_cpool_free(oci8_base_t *base)

data/ext/oci8/encoding.c

@@ -30,8 +30,6 @@ rb_encoding *oci8_encoding;
  * call-seq:
  *   charset_id2name(charset_id) -> charset_name
  *
- * <b>(new in 2.0.0)</b>
- *
  * Returns the Oracle character set name from the specified
  * character set ID if it is valid. Otherwise, +nil+ is returned.
  *
@@ -48,6 +46,9 @@ rb_encoding *oci8_encoding;
  *     :name := nls_charset_name(:csid);
  *   END;
  *
+ * @param [Fixnum] charset_id   Oracle character set id
+ * @return [String]             Oracle character set name or nil
+ * @since 2.0.0
  */
 VALUE oci8_charset_id2name(VALUE svc, VALUE csid)
 {
@@ -104,8 +105,6 @@ VALUE oci8_charset_id2name(VALUE svc, VALUE csid)
  * call-seq:
  *   charset_name2id(charset_name) -> charset_id
  *
- * <b>(new in 2.0.0)</b>
- *
  * Returns the Oracle character set ID for the specified Oracle
  * character set name if it is valid. Othewise, +nil+ is returned.
  *
@@ -122,6 +121,9 @@ VALUE oci8_charset_id2name(VALUE svc, VALUE csid)
  *     :csid := nls_charset_id(:name);
  *   END;
  *
+ * @param [String] charset_name   Oracle character set name
+ * @return [Fixnum]               Oracle character set id or nil
+ * @since 2.0.0
  */
 static VALUE oci8_charset_name2id(VALUE svc, VALUE name)
 {
@@ -176,12 +178,13 @@ static VALUE oci8_charset_name2id(VALUE svc, VALUE name)
  * call-seq:
  *   OCI8.nls_ratio -> integer
  *
- * <b>(new in 2.1.0)</b>
- *
  * Gets NLS ratio, maximum number of bytes per one character of the
  * current NLS chracter set. It is a factor to calculate the
  * internal buffer size of a string bind variable whose nls length
  * semantics is char.
+ *
+ * @return [Fixnum]  NLS ratio
+ * @since 2.1.0
  */
 static VALUE oci8_get_nls_ratio(VALUE klass)
 {
@@ -192,11 +195,12 @@ static VALUE oci8_get_nls_ratio(VALUE klass)
  * call-seq:
  *   OCI8.nls_ratio = integer
  *
- * <b>(new in 2.1.0)</b>
- *
  * Sets NLS ratio, maximum number of bytes per one character of the
  * current NLS chracter set. It is initialized in 'oci8/encoding-init.rb'
  * when oci8 is required. You have no need to set it explicitly.
+ *
+ * @param [Fixnum] integer  NLS ratio
+ * @since 2.1.0
  */
 static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
 {
@@ -214,8 +218,6 @@ static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
  * call-seq:
  *    OCI8.encoding -> enc
  *
- * <b>(new in 2.0.0 and ruby 1.9)</b>
- *
  * Returns the Oracle client encoding.
  *
  * When string data, such as SQL statements and bind variables,
@@ -238,6 +240,9 @@ static VALUE oci8_set_nls_ratio(VALUE klass, VALUE val)
  *
  * If +OCI8.encoding+ is ASCII-8BIT, no encoding conversions
  * are done.
+ *
+ * @return [Encoding]
+ * @since 2.0.0 and ruby 1.9
  */
 static VALUE oci8_get_encoding(VALUE klass)
 {
@@ -248,11 +253,12 @@ static VALUE oci8_get_encoding(VALUE klass)
  * call-seq:
  *   OCI8.encoding = enc or nil
  *
- * <b>(new in 2.0.0 and ruby 1.9)</b>
- *
  * Sets Oracle client encoding. You must not use this method.
  * You should set the environment variable NLS_LANG properly to
  * change +OCI8.encoding+.
+ *
+ * @param [Encoding]  enc
+ * @since 2.0.0 and ruby 1.9
  */
 static VALUE oci8_set_encoding(VALUE klass, VALUE encoding)
 {

data/ext/oci8/env.c

@@ -110,7 +110,7 @@ void Init_oci8_env(void)
     int error;
 #endif
 
-#if !defined(HAVE_RB_THREAD_BLOCKING_REGION) && !defined(_WIN32)
+#if !defined(NATIVE_THREAD_WITH_GVL) && !defined(_WIN32)
     /* workaround code.
      *
      * Some instant clients set the environment variables

data/ext/oci8/extconf.rb

@@ -107,18 +107,20 @@ have_func("localtime_r")
 # ruby 1.8 headers
 have_header("intern.h")
 have_header("util.h")
-# ruby 1.9 headers
+# ruby 1.9.1 headers
 have_header("ruby/util.h")
 have_type('rb_encoding', ['ruby/ruby.h', 'ruby/encoding.h'])
+# ruby 2.0.0 headers
+have_header("ruby/thread.h")
 
 # $! in C API
 have_var("ruby_errinfo", "ruby.h") # ruby 1.8
 have_func("rb_errinfo", "ruby.h")  # ruby 1.9
 
-have_type("rb_blocking_function_t*", "ruby.h")
 have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
 have_func("rb_thread_blocking_region", "ruby.h")
+have_func("rb_thread_call_without_gvl", "ruby/thread.h")
 
 # replace files
 replace = {
@@ -129,22 +131,23 @@ replace = {
 # make ruby script before running create_makefile.
 replace_keyword(File.dirname(__FILE__) + '/../../lib/oci8.rb.in', '../../lib/oci8.rb', replace)
 
+ruby_engine = (defined? RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+
 so_basename = 'oci8lib_'
-if defined? RUBY_ENGINE and RUBY_ENGINE != 'ruby'
-  so_basename += RUBY_ENGINE
+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/, '')
+else
+  so_basename += ruby_engine
 end
 
-# 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 and 2.0.0-dev at the present time.
-so_basename += RbConfig::CONFIG["ruby_version"].gsub(/\W/, '')
-
 $defs << "-DInit_oci8lib=Init_#{so_basename}"
 $defs << "-Doci8lib=#{so_basename}"
 $defs << "-DOCI8LIB_VERSION=\\\"#{RUBY_OCI8_VERSION}\\\""
-if defined? RUBY_ENGINE and RUBY_ENGINE == 'rbx'
-  $defs << "-DCHAR_IS_NOT_A_SHORTCUT_TO_ID"
-end
+$defs << "-DCHAR_IS_NOT_A_SHORTCUT_TO_ID" if ruby_engine != 'ruby'
 
 create_header()
 

data/ext/oci8/lob.c

@@ -36,13 +36,19 @@ static VALUE oci8_lob_write(VALUE self, VALUE data);
 static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
 {
     oci8_lob_t *lob;
+    boolean is_temp;
     VALUE lob_obj;
 
     lob_obj = rb_funcall(klass, oci8_id_new, 1, svcctx->base.self);
     lob = DATA_PTR(lob_obj);
     /* If 's' is a temporary lob, use OCILobLocatorAssign instead. */
-    chker2(OCILobAssign(oci8_envhp, oci8_errhp, s, &lob->base.hp.lob),
-           &svcctx->base);
+    chker2(OCILobIsTemporary(oci8_envhp, oci8_errhp, s, &is_temp), &svcctx->base);
+    if (is_temp)
+        chker2(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, s, &lob->base.hp.lob),
+               &svcctx->base);
+    else
+        chker2(OCILobAssign(oci8_envhp, oci8_errhp, s, &lob->base.hp.lob),
+               &svcctx->base);
     return lob_obj;
 }
 
@@ -107,8 +113,19 @@ static void oci8_lob_free(oci8_base_t *base)
         && 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;
+        temp_lob->lob = lob->base.hp.lob;
+        svcctx->temp_lobs = temp_lob;
+        lob->base.type = 0;
+        lob->base.hp.ptr = NULL;
+#else
         /* FIXME: This may stall the GC. */
         OCILobFreeTemporary(lob->svchp, oci8_errhp, lob->base.hp.lob);
+#endif
     }
     lob->svc = Qnil;
     lob->svchp = NULL;

data/ext/oci8/oci8.c

@@ -41,6 +41,26 @@ static VALUE cServer;
 static ID id_at_session_handle;
 static ID id_at_server_handle;
 
+static VALUE dummy_env_method_missing(int argc, VALUE *argv, VALUE self)
+{
+    VALUE obj = rb_cv_get(cOCI8, "@@environment_handle");
+    VALUE method_id, args;
+
+    if (self == obj) {
+        oci8_base_t *base;
+        obj = rb_obj_alloc(oci8_cOCIHandle);
+        base = DATA_PTR(obj);
+        base->type = OCI_HTYPE_ENV;
+        base->hp.ptr = oci8_envhp;
+        base->self = Qnil;
+        rb_cv_set(cOCI8, "@@environment_handle", obj);
+    }
+
+    rb_scan_args(argc, argv, "1*", &method_id, &args);
+    Check_Type(method_id, T_SYMBOL);
+    return rb_apply(obj, SYM2ID(method_id), args);
+}
+
 typedef struct oci8_svcctx_associate {
     oci8_base_t base;
     oci8_svcctx_t *svcctx;
@@ -81,6 +101,18 @@ static void copy_server_handle(oci8_svcctx_t *svcctx)
 static void oci8_svcctx_free(oci8_base_t *base)
 {
     oci8_svcctx_t *svcctx = (oci8_svcctx_t *)base;
+    oci8_temp_lob_t *lob;
+
+    lob = svcctx->temp_lobs;
+    while (lob != NULL) {
+        oci8_temp_lob_t *lob_next = lob->next;
+
+        OCIDescriptorFree(lob->lob, OCI_DTYPE_LOB);
+        xfree(lob);
+        lob = lob_next;
+    }
+    svcctx->temp_lobs = NULL;
+
     if (svcctx->logoff_strategy != NULL) {
         const oci8_logoff_strategy_t *strategy = svcctx->logoff_strategy;
         void *data = strategy->prepare(svcctx);
@@ -117,7 +149,7 @@ static void oci8_svcctx_init(oci8_base_t *base)
 
     svcctx->pid = getpid();
     svcctx->is_autocommit = 0;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef NATIVE_THREAD_WITH_GVL
     svcctx->non_blocking = 1;
 #endif
     svcctx->long_read_len = INT2FIX(65535);
@@ -176,6 +208,8 @@ static VALUE oci8_s_set_property(VALUE klass, VALUE name, VALUE val)
  *   # When NLS_LANG is FRENCH_FRANCE.AL32UTF8
  *   OCI8.error_message(1) # => "ORA-00001: violation de contrainte unique (%s.%s)"
  *
+ * @param [Fixnum] message_no   Oracle error message number
+ * @return [String]             Oracle error message
  */
 static VALUE oci8_s_error_message(VALUE klass, VALUE msgid)
 {
@@ -252,7 +286,7 @@ static void *simple_logoff_prepare(oci8_svcctx_t *svcctx)
     return sla;
 }
 
-static VALUE simple_logoff_execute(void *arg)
+static void *simple_logoff_execute(void *arg)
 {
     simple_logoff_arg_t *sla = (simple_logoff_arg_t *)arg;
     OCIError *errhp = oci8_errhp;
@@ -261,7 +295,7 @@ static VALUE simple_logoff_execute(void *arg)
     OCITransRollback(sla->svchp, errhp, OCI_DEFAULT);
     rv = OCILogoff(sla->svchp, errhp);
     xfree(sla);
-    return (VALUE)rv;
+    return (void*)(VALUE)rv;
 }
 
 static const oci8_logoff_strategy_t simple_logoff = {
@@ -293,7 +327,7 @@ static void *complex_logoff_prepare(oci8_svcctx_t *svcctx)
     return cla;
 }
 
-static VALUE complex_logoff_execute(void *arg)
+static void *complex_logoff_execute(void *arg)
 {
     complex_logoff_arg_t *cla = (complex_logoff_arg_t *)arg;
     OCIError *errhp = oci8_errhp;
@@ -319,7 +353,7 @@ static VALUE complex_logoff_execute(void *arg)
         OCIHandleFree(cla->svchp, OCI_HTYPE_SVCCTX);
     }
     xfree(cla);
-    return (VALUE)rv;
+    return (void*)(VALUE)rv;
 }
 
 static const oci8_logoff_strategy_t complex_logoff = {
@@ -419,32 +453,6 @@ static VALUE oci8_allocate_handles(VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *   session_handle -> a session handle
- *
- * <b>internal use only</b>
- *
- * Returns a session handle associated with the service context handle.
- */
-static VALUE oci8_get_session_handle(VALUE self)
-{
-    return rb_ivar_get(self, id_at_session_handle);
-}
-
-/*
- * call-seq:
- *   server_handle -> a server handle
- *
- * <b>internal use only</b>
- *
- * Returns a server handle associated with the service context handle.
- */
-static VALUE oci8_get_server_handle(VALUE self)
-{
-    return rb_ivar_get(self, id_at_server_handle);
-}
-
 /*
  * call-seq:
  *   server_attach(dbname, mode)
@@ -542,7 +550,7 @@ static VALUE oci8_svcctx_logoff(VALUE self)
         void *data = strategy->prepare(svcctx);
         svcctx->base.type = 0;
         svcctx->logoff_strategy = NULL;
-        chker2(oci8_blocking_region(svcctx, strategy->execute, data), &svcctx->base);
+        chker2(oci8_call_without_gvl(svcctx, strategy->execute, data), &svcctx->base);
     }
     return Qtrue;
 }
@@ -585,7 +593,7 @@ static VALUE oci8_rollback(VALUE self)
 static VALUE oci8_non_blocking_p(VALUE self)
 {
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef NATIVE_THREAD_WITH_GVL
     return svcctx->non_blocking ? Qtrue : Qfalse;
 #else
     sb1 non_blocking;
@@ -635,7 +643,7 @@ static VALUE oci8_non_blocking_p(VALUE self)
 static VALUE oci8_set_non_blocking(VALUE self, VALUE val)
 {
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef NATIVE_THREAD_WITH_GVL
     svcctx->non_blocking = RTEST(val);
 #else
     sb1 non_blocking;
@@ -729,7 +737,7 @@ static VALUE oci8_break(VALUE self)
     if (NIL_P(svcctx->executing_thread)) {
         return Qfalse;
     }
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+#ifndef NATIVE_THREAD_WITH_GVL
     chker2(OCIBreak(svcctx->base.hp.ptr, oci8_errhp), &svcctx->base);
 #endif
     rb_thread_wakeup(svcctx->executing_thread);
@@ -757,11 +765,11 @@ static VALUE oci8_set_prefetch_rows(VALUE self, VALUE val)
  * call-seq:
  *   oracle_server_vernum -> an integer
  *
- * <b>(new in 2.0.1)</b>
- *
  * Returns a numerical format of the Oracle server version.
  *
  * See also: #oracle_server_version
+ *
+ * @since 2.0.1
  */
 static VALUE oci8_oracle_server_vernum(VALUE self)
 {
@@ -777,8 +785,6 @@ static VALUE oci8_oracle_server_vernum(VALUE self)
  * call-seq:
  *   ping -> true or false
  *
- * <b>(new in 2.0.2)</b>
- *
  * Makes a round trip call to the server to confirm that the connection and
  * the server are active.
  *
@@ -791,6 +797,8 @@ static VALUE oci8_oracle_server_vernum(VALUE self)
  *
  * === Oracle 10.1 client or lower
  * A simple PL/SQL block "BEGIN NULL; END;" is executed to make a round trip call.
+ *
+ * @since 2.0.2
  */
 static VALUE oci8_ping(VALUE self)
 {
@@ -811,8 +819,6 @@ static VALUE oci8_ping(VALUE self)
  * call-seq:
  *   client_identifier = string or nil
  *
- * <b>(new in 2.0.3)</b>
- *
  * Sets the client ID. This information is stored in the V$SESSION
  * view.
  *
@@ -833,6 +839,7 @@ static VALUE oci8_ping(VALUE self)
  *
  * See {Oracle Manual: Oracle Database PL/SQL Packages and Types Reference}[http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14258/d_sessio.htm#i996935]
  *
+ * @since 2.0.3
  */
 static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
 {
@@ -878,8 +885,6 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
  * call-seq:
  *   module = string or nil
  *
- * <b>(new in 2.0.3)</b>
- *
  * Sets the name of the current module. This information is
  * stored in the V$SESSION view and is also stored in the V$SQL view
  * and the V$SQLAREA view when a SQL statement is executed and the SQL
@@ -907,6 +912,7 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
  *
  * See {Oracle Manual: Oracle Database PL/SQL Packages and Types Reference}[http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14258/d_appinf.htm#i999254]
  *
+ * @since 2.0.3
  */
 static VALUE oci8_set_module(VALUE self, VALUE val)
 {
@@ -952,8 +958,6 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
  * call-seq:
  *   action = string or nil
  *
- * <b>(new in 2.0.3)</b>
- *
  * Sets the name of the current action within the current module.
  * This information is stored in the V$SESSION view and is also
  * stored in the V$SQL view and the V$SQLAREA view when a SQL
@@ -977,6 +981,7 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
  *
  * See {Oracle Manual: Oracle Database PL/SQL Packages and Types Reference}[http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14258/d_appinf.htm#i999254]
  *
+ * @since 2.0.3
  */
 static VALUE oci8_set_action(VALUE self, VALUE val)
 {
@@ -1019,8 +1024,6 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
  * call-seq:
  *   client_info = string or nil
  *
- * <b>(new in 2.0.3)</b>
- *
  * Sets additional information about the client application.
  * This information is stored in the V$SESSION view.
  *
@@ -1040,6 +1043,8 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
  *   END;
  *
  * See {Oracle Manual: Oracle Database PL/SQL Packages and Types Reference}[http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14258/d_appinf.htm#CHEJCFGG]
+ *
+ * @since 2.0.3
  */
 static VALUE oci8_set_client_info(VALUE self, VALUE val)
 {
@@ -1078,9 +1083,11 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
     return val;
 }
 
-VALUE Init_oci8(void)
+void Init_oci8(VALUE *out)
 {
-#if 0
+    VALUE obj;
+    oci8_base_t *base;
+#if /* for yard */ 0
     oci8_cOCIHandle = rb_define_class("OCIHandle", rb_cObject);
     cOCI8 = rb_define_class("OCI8", oci8_cOCIHandle);
 #endif
@@ -1090,6 +1097,18 @@ VALUE Init_oci8(void)
     id_at_session_handle = rb_intern("@session_handle");
     id_at_server_handle = rb_intern("@server_handle");
 
+    /* setup a dummy environment handle to lazily initialize the environment handle */
+    obj = rb_obj_alloc(rb_cObject);
+    rb_define_singleton_method(obj, "method_missing", dummy_env_method_missing, -1);
+    rb_cv_set(cOCI8, "@@environment_handle", obj);
+
+    /* setup the process handle */
+    obj = rb_obj_alloc(oci8_cOCIHandle);
+    base = DATA_PTR(obj);
+    base->type = OCI_HTYPE_PROC;
+    base->self = Qnil;
+    rb_cv_set(cOCI8, "@@process_handle", obj);
+
     oracle_client_vernum = INT2FIX(oracle_client_version);
     if (have_OCIClientVersion) {
         sword major, minor, update, patch, port_update;
@@ -1107,8 +1126,6 @@ VALUE Init_oci8(void)
     rb_define_private_method(cOCI8, "parse_connect_string", oci8_parse_connect_string, 1);
     rb_define_private_method(cOCI8, "logon2", oci8_logon2, 4);
     rb_define_private_method(cOCI8, "allocate_handles", oci8_allocate_handles, 0);
-    rb_define_private_method(cOCI8, "session_handle", oci8_get_session_handle, 0);
-    rb_define_private_method(cOCI8, "server_handle", oci8_get_server_handle, 0);
     rb_define_private_method(cOCI8, "server_attach", oci8_server_attach, 2);
     rb_define_private_method(cOCI8, "session_begin", oci8_session_begin, 2);
     rb_define_method(cOCI8, "logoff", oci8_svcctx_logoff, 0);
@@ -1129,7 +1146,7 @@ VALUE Init_oci8(void)
     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);
-    return cOCI8;
+    *out = cOCI8;
 }
 
 oci8_svcctx_t *oci8_get_svcctx(VALUE obj)