ruby-oci8 2.1.8 → 2.2.0.1

data/ext/oci8/oci8.c

@@ -250,9 +250,7 @@ static VALUE oci8_svcctx_alloc(VALUE klass)
 
     svcctx->pid = getpid();
     svcctx->is_autocommit = 0;
-#ifdef NATIVE_THREAD_WITH_GVL
     svcctx->non_blocking = 1;
-#endif
     svcctx->long_read_len = INT2FIX(65535);
     return self;
 }
@@ -267,10 +265,10 @@ static VALUE oracle_client_vernum; /* Oracle client version number */
  *  It is devided into 5 parts: 8, 4, 8, 4 and 8 bits.
  *
  *  @example
- *    # Oracle 9.2.0.4
- *    oracle_client_vernum # => 0x09200400
- *                         # => 0x09 2 00 4 00
- *                         # => 9.2.0.4.0
+ *    # Oracle 10.2.0.4
+ *    oracle_client_vernum # => 0x0a200400
+ *                         # => 0x0a 2 00 4 00
+ *                         # => 10.2.0.4.0
  *
  *    # Oracle 11.1.0.7.0
  *    oracle_client_vernum # => 0x0b100700
@@ -761,14 +759,7 @@ static VALUE oci8_rollback(VALUE self)
 static VALUE oci8_non_blocking_p(VALUE self)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
-#ifdef NATIVE_THREAD_WITH_GVL
     return svcctx->non_blocking ? Qtrue : Qfalse;
-#else
-    sb1 non_blocking;
-
-    chker2(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
-    return non_blocking ? Qtrue : Qfalse;
-#endif
 }
 
 /*
@@ -791,20 +782,7 @@ static VALUE oci8_non_blocking_p(VALUE self)
 static VALUE oci8_set_non_blocking(VALUE self, VALUE val)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
-#ifdef NATIVE_THREAD_WITH_GVL
     svcctx->non_blocking = RTEST(val);
-#else
-    sb1 non_blocking;
-
-    if (svcctx->state & OCI8_STATE_CPOOL) {
-        rb_raise(rb_eRuntimeError, "Could not set non-blocking mode to a connection allocated from OCI8::ConnectionPool.");
-    }
-    chker2(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
-    if ((RTEST(val) && !non_blocking) || (!RTEST(val) && non_blocking)) {
-        /* toggle blocking / non-blocking. */
-        chker2(OCIAttrSet(svcctx->srvhp, OCI_HTYPE_SERVER, 0, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
-    }
-#endif
     return val;
 }
 
@@ -894,9 +872,6 @@ static VALUE oci8_break(VALUE self)
     if (NIL_P(svcctx->executing_thread)) {
         return Qfalse;
     }
-#ifndef NATIVE_THREAD_WITH_GVL
-    chker2(OCIBreak(svcctx->base.hp.ptr, oci8_errhp), &svcctx->base);
-#endif
     rb_thread_wakeup(svcctx->executing_thread);
     return Qtrue;
 }
@@ -960,21 +935,9 @@ static VALUE oci8_ping(VALUE self)
  *
  *  Sets the specified value to {V$SESSION.CLIENT_IDENTIFIER}[http://docs.oracle.com/database/121/REFRN/refrn30223.htm#r62c1-t21].
  *
- *  === Oracle 9i client or upper
- *
  *  The specified value is sent to the server by piggybacking on the next network
  *  round trip issued by {OCI8#exec}, {OCI8#ping} and so on.
  *
- *  === Oracle 8i client or lower
- *
- *  This executes the following PL/SQL block internally.
- *
- *    BEGIN
- *      DBMS_SESSION.SET_IDENTIFIER(:client_id);
- *    END;
- *
- *  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]
- *
  *  @param [String] client_identifier
  *  @since 2.0.3
  */
@@ -993,29 +956,12 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
         size = 0;
     }
 
-    if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0) || size > 0) {
-        if (size > 0 && ptr[0] == ':') {
-            rb_raise(rb_eArgError, "client identifier should not start with ':'.");
-        }
-        chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
-                          size, OCI_ATTR_CLIENT_IDENTIFIER, oci8_errhp),
-               &svcctx->base);
-    } else {
-        /* Workaround for Bug 2449486 */
-        oci8_exec_sql_var_t bind_vars[1];
-
-        /* :client_id */
-        bind_vars[0].valuep = (dvoid*)ptr;
-        bind_vars[0].value_sz = size;
-        bind_vars[0].dty = SQLT_CHR;
-        bind_vars[0].indp = NULL;
-        bind_vars[0].alenp = NULL;
-
-        oci8_exec_sql(svcctx,
-                      "BEGIN\n"
-                      "  DBMS_SESSION.SET_IDENTIFIER(:client_id);\n"
-                      "END;\n", 0, NULL, 1, bind_vars, 1);
+    if (size > 0 && ptr[0] == ':') {
+        rb_raise(rb_eArgError, "client identifier should not start with ':'.");
     }
+    chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
+                      size, OCI_ATTR_CLIENT_IDENTIFIER, oci8_errhp),
+           &svcctx->base);
     return val;
 }
 
@@ -1027,26 +973,6 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
  *  and {V$SQLAREA.MODULE}[http://docs.oracle.com/database/121/REFRN/refrn30259.htm#r46c1-t94]
  *  when an SQL statement is first parsed in the Oracle server.
  *
- *  === Oracle 10g client or upper
- *
- *  The specified value is sent to the server by piggybacking on the next network
- *  round trip issued by {OCI8#exec}, {OCI8#ping} and so on.
- *
- *  === Oracle 9i client or lower
- *
- *  This executes the following PL/SQL block internally.
- *
- *    DECLARE
- *      action VARCHAR2(32);
- *    BEGIN
- *      -- retrieve action name.
- *      SELECT SYS_CONTEXT('USERENV','ACTION') INTO action FROM DUAL;
- *      -- change module name without modifying the action name.
- *      DBMS_APPLICATION_INFO.SET_MODULE(:module, action);
- *    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#i999254]
- *
  *  @param [String] module
  *  @since 2.0.3
  */
@@ -1064,30 +990,9 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
         ptr = "";
         size = 0;
     }
-    if (oracle_client_version >= ORAVER_10_1) {
-        /* Oracle 10g or upper */
-        chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
-                          size, OCI_ATTR_MODULE, oci8_errhp),
-               &svcctx->base);
-    } else {
-        /* Oracle 9i or lower */
-        oci8_exec_sql_var_t bind_vars[1];
-
-        /* :module */
-        bind_vars[0].valuep = (dvoid*)ptr;
-        bind_vars[0].value_sz = size;
-        bind_vars[0].dty = SQLT_CHR;
-        bind_vars[0].indp = NULL;
-        bind_vars[0].alenp = NULL;
-
-        oci8_exec_sql(svcctx,
-                      "DECLARE\n"
-                      "  action VARCHAR2(32);\n"
-                      "BEGIN\n"
-                      "  SELECT SYS_CONTEXT('USERENV','ACTION') INTO action FROM DUAL;\n"
-                      "  DBMS_APPLICATION_INFO.SET_MODULE(:module, action);\n"
-                      "END;\n", 0, NULL, 1, bind_vars, 1);
-    }
+    chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
+                      size, OCI_ATTR_MODULE, oci8_errhp),
+           &svcctx->base);
     return self;
 }
 
@@ -1099,21 +1004,9 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
  *  and {V$SQLAREA.ACTION}[http://docs.oracle.com/database/121/REFRN/refrn30259.htm#r48c1-t94]
  *  when an SQL statement is first parsed in the Oracle server.
  *
- *  === Oracle 10g client or upper
- *
  *  The specified value is sent to the server by piggybacking on the next network
  *  round trip issued by {OCI8#exec}, {OCI8#ping} and so on.
  *
- *  === Oracle 9i client or lower
- *
- *  This executes the following PL/SQL block internally.
- *
- *    BEGIN
- *      DBMS_APPLICATION_INFO.SET_ACTION(:action);
- *    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#i999254]
- *
  *  @param [String] action
  *  @since 2.0.3
  */
@@ -1131,27 +1024,9 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
         ptr = "";
         size = 0;
     }
-    if (oracle_client_version >= ORAVER_10_1) {
-        /* Oracle 10g or upper */
-        chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
-                          size, OCI_ATTR_ACTION, oci8_errhp),
-               &svcctx->base);
-    } else {
-        /* Oracle 9i or lower */
-        oci8_exec_sql_var_t bind_vars[1];
-
-        /* :action */
-        bind_vars[0].valuep = (dvoid*)ptr;
-        bind_vars[0].value_sz = size;
-        bind_vars[0].dty = SQLT_CHR;
-        bind_vars[0].indp = NULL;
-        bind_vars[0].alenp = NULL;
-
-        oci8_exec_sql(svcctx,
-                      "BEGIN\n"
-                      "  DBMS_APPLICATION_INFO.SET_ACTION(:action);\n"
-                      "END;\n", 0, NULL, 1, bind_vars, 1);
-    }
+    chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
+                      size, OCI_ATTR_ACTION, oci8_errhp),
+           &svcctx->base);
     return val;
 }
 
@@ -1160,21 +1035,9 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
  *
  *  Sets the specified value to {V$SESSION.CLIENT_INFO}[http://docs.oracle.com/database/121/REFRN/refrn30223.htm#r44c1-t21].
  *
- *  === Oracle 10g client or upper
- *
  *  The specified value is sent to the server by piggybacking on the next network
  *  round trip issued by {OCI8#exec}, {OCI8#ping} and so on.
  *
- *  === Oracle 9i client or lower
- *
- *  This executes the following PL/SQL block internally.
- *
- *    BEGIN
- *      DBMS_APPLICATION_INFO.SET_CLIENT_INFO(:client_info);
- *    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]
- *
  *  @param [String] client_info
  *  @since 2.0.3
  */
@@ -1192,27 +1055,9 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
         ptr = "";
         size = 0;
     }
-    if (oracle_client_version >= ORAVER_10_1) {
-        /* Oracle 10g or upper */
-        chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
-                          size, OCI_ATTR_CLIENT_INFO, oci8_errhp),
-               &svcctx->base);
-    } else {
-        /* Oracle 9i or lower */
-        oci8_exec_sql_var_t bind_vars[1];
-
-        /* :client_info */
-        bind_vars[0].valuep = (dvoid*)ptr;
-        bind_vars[0].value_sz = size;
-        bind_vars[0].dty = SQLT_CHR;
-        bind_vars[0].indp = NULL;
-        bind_vars[0].alenp = NULL;
-
-        oci8_exec_sql(svcctx, 
-                      "BEGIN\n"
-                      "  DBMS_APPLICATION_INFO.SET_CLIENT_INFO(:client_info);\n"
-                      "END;\n", 0, NULL, 1, bind_vars, 1);
-    }
+    chker2(OCIAttrSet(svcctx->usrhp, OCI_HTYPE_SESSION, (dvoid*)ptr,
+                      size, OCI_ATTR_CLIENT_INFO, oci8_errhp),
+           &svcctx->base);
     return val;
 }
 
@@ -1251,7 +1096,7 @@ void Init_oci8(VALUE *out)
         oracle_client_vernum = INT2FIX(ORAVERNUM(major, minor, update, patch, port_update));
     }
 
-    rb_define_const(cOCI8, "VERSION", rb_obj_freeze(rb_usascii_str_new_cstr(OCI8LIB_VERSION)));
+    rb_define_const(cOCI8, "LIB_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, "__get_prop", oci8_s_get_prop, 1);
     rb_define_singleton_method_nodoc(cOCI8, "__set_prop", oci8_s_set_prop, 2);

data/ext/oci8/oci8.h

@@ -2,21 +2,12 @@
 /*
  * oci8.h - part of ruby-oci8
  *
- * Copyright (C) 2002-2014 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
  */
 #ifndef _RUBY_OCI_H_
 #define _RUBY_OCI_H_ 1
 
 #include "ruby.h"
-
-#ifndef rb_pid_t
-#ifdef WIN32
-#define rb_pid_t int
-#else
-#define rb_pid_t pid_t
-#endif
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -43,9 +34,7 @@ extern "C"
 #define ORAVER_12_1 ORAVERNUM(12, 1, 0, 0, 0)
 
 #include "extconf.h"
-#ifdef HAVE_TYPE_RB_ENCODING
 #include <ruby/encoding.h>
-#endif
 
 #ifndef OCI_TEMP_CLOB
 #define OCI_TEMP_CLOB 1
@@ -101,75 +90,7 @@ typedef struct OCIMsg  OCIMsg;
 typedef struct OCICPool OCICPool;
 #endif
 
-/* new macros in ruby 1.8.6.
- * define compatible macros for ruby 1.8.5 or lower.
- */
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(obj) RSTRING(obj)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(obj) RSTRING(obj)->len
-#endif
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(obj) RARRAY(obj)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(obj) RARRAY(obj)->len
-#endif
-
-#ifndef HAVE_RB_STR_SET_LEN
-#define rb_str_set_len(s, l) do { \
-    RSTRING(s)->len = (l); \
-    RSTRING(s)->ptr[l] = '\0'; \
-} while (0)
-#endif
-
-/* new macros in ruby 1.9.
- * define compatible macros for ruby 1.8 or lower.
- */
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(obj) RFLOAT(obj)->value
-#endif
-#ifndef STRINGIZE
-#define STRINGIZE(name) #name
-#endif
-#ifndef RB_GC_GUARD
-#ifdef __GNUC__
-#define RB_GC_GUARD_PTR(ptr) \
-    __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;})
-#else
-#ifdef _MSC_VER
-#pragma optimize("", off)
-#endif
-static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;}
-#ifdef _MSC_VER
-#pragma optimize("", on)
-#endif
-#define RB_GC_GUARD_PTR(ptr) rb_gc_guarded_ptr(ptr)
-#endif
-#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
-#endif
-
-/* new functions in ruby 1.9.
- * define compatible macros for ruby 1.8 or lower.
- */
-#if !defined(HAVE_RB_ERRINFO) && defined(HAVE_RUBY_ERRINFO)
-#define rb_errinfo() ruby_errinfo
-#endif
-
-#ifndef HAVE_TYPE_RB_ENCODING
-/* ruby 1.8, rubinuis 1.2 */
-#define rb_enc_associate(str, enc) do {} while(0)
-#define rb_enc_str_new(str, len, enc) rb_str_new((str), (len))
-#define rb_enc_str_buf_cat(str, ptr, len, enc) rb_str_buf_cat((str), (ptr), (len))
-#define rb_external_str_new_with_enc(ptr, len, enc) rb_tainted_str_new((ptr), (len))
-#define rb_locale_str_new_cstr(ptr)  rb_str_new2(ptr)
-#define rb_str_buf_cat_ascii(str, ptr) rb_str_buf_cat2((str), (ptr))
-#define rb_str_conv_enc(str, from, to) (str)
-#define rb_str_export_to_enc(str, enc) (str)
-#define rb_usascii_str_new(ptr, len) rb_str_new((ptr), (len))
-#define rb_usascii_str_new_cstr(ptr) rb_str_new2(ptr)
-#elif defined RBX_CAPI_RUBY_H
+#if defined RBX_CAPI_RUBY_H
 /* rubinius 2.0 */
 #ifndef HAVE_RB_ENC_STR_BUF_CAT
 #define rb_enc_str_buf_cat(str, ptr, len, enc) \
@@ -179,6 +100,9 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
 #define rb_str_buf_cat_ascii(str, ptr) \
     rb_str_concat((str), rb_usascii_str_new_cstr(ptr))
 #endif
+#ifndef STRINGIZE
+#define STRINGIZE(name) #name
+#endif
 #endif
 
 /*
@@ -247,18 +171,6 @@ struct oci8_data_type_struct {
 #define RB_OBJ_WRITTEN(a, oldv, b) do {(void)oldv;} while (0)
 #endif
 
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) || defined(HAVE_RB_THREAD_BLOCKING_REGION)
-#define NATIVE_THREAD_WITH_GVL 1
-#endif
-
-#if defined(HAVE_NATIVETHREAD) || NATIVE_THREAD_WITH_GVL
-/*
- * oci8_errhp is a thread local object in ruby 1.9, rubinius
- * and ruby 1.8 configured with --enable-pthread.
- */
-#define USE_THREAD_LOCAL_ERRHP 1
-#endif
-
 /* macros depends on the compiler.
  *  LIKELY(x)      hint for the compiler that 'x' is 1(TRUE) in many cases.
  *  UNLIKELY(x)    hint for the compiler that 'x' is 0(FALSE) in many cases.
@@ -291,8 +203,6 @@ struct oci8_data_type_struct {
  *    set a value to the key.
  *
  */
-#ifdef USE_THREAD_LOCAL_ERRHP
-/* rubies with native-thread support. */
 #if defined(_WIN32)
 #include <windows.h>
 #define oci8_tls_key_t           DWORD
@@ -304,7 +214,6 @@ struct oci8_data_type_struct {
 #define oci8_tls_get(key)        pthread_getspecific(key)
 #define oci8_tls_set(key, val)   pthread_setspecific((key), (val))
 #endif
-#endif /* USE_THREAD_LOCAL_ERRHP */
 
 /* utility macros
  */
@@ -439,9 +348,7 @@ typedef struct oci8_svcctx {
     unsigned char state;
     char is_autocommit;
     char suppress_free_temp_lobs;
-#ifdef NATIVE_THREAD_WITH_GVL
     char non_blocking;
-#endif
     VALUE long_read_len;
     oci8_temp_lob_t *temp_lobs;
 } oci8_svcctx_t;
@@ -469,12 +376,6 @@ typedef struct {
 #define chker2(status, base) oci8_check_error_((status), (base), NULL, __FILE__, __LINE__)
 #define chker3(status, base, stmt) oci8_check_error_((status), (base), (stmt), __FILE__, __LINE__)
 
-#if SIZEOF_LONG > 4
-#define UB4_TO_NUM INT2FIX
-#else
-#define UB4_TO_NUM UINT2NUM
-#endif
-
 /* The folloiwng macros oci8_envhp and oci8_errhp are used
  * as if they are defined as follows:
  *
@@ -482,17 +383,12 @@ typedef struct {
  *   extern OCIError *oci8_errhp;
  */
 #define oci8_envhp (LIKELY(oci8_global_envhp != NULL) ? oci8_global_envhp : oci8_make_envhp())
-#ifdef USE_THREAD_LOCAL_ERRHP
 #define oci8_errhp oci8_get_errhp()
-#else
-#define oci8_errhp (LIKELY(oci8_global_errhp != NULL) ? oci8_global_errhp : oci8_make_errhp())
-#endif
 
 /* env.c */
 extern ub4 oci8_env_mode;
 extern OCIEnv *oci8_global_envhp;
 OCIEnv *oci8_make_envhp(void);
-#ifdef USE_THREAD_LOCAL_ERRHP
 extern oci8_tls_key_t oci8_tls_key; /* native thread key */
 OCIError *oci8_make_errhp(void);
 
@@ -502,10 +398,6 @@ static inline OCIError *oci8_get_errhp()
     return LIKELY(errhp != NULL) ? errhp : oci8_make_errhp();
 }
 
-#else
-extern OCIError *oci8_global_errhp;
-OCIError *oci8_make_errhp(void);
-#endif
 void Init_oci8_env(void);
 
 /* oci8lib.c */
@@ -636,8 +528,12 @@ VALUE oci8_get_rowid_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
 
 /* encoding.c */
 void Init_oci8_encoding(VALUE cOCI8);
-VALUE oci8_charset_id2name(VALUE svc, VALUE charset_id);
 extern int oci8_nls_ratio;
+extern rb_encoding *oci8_encoding;
+
+/* util.c */
+void Init_oci8_util(VALUE cOCI8);
+const char *oci8_dll_path(void);
 
 /* win32.c */
 void Init_oci8_win32(VALUE cOCI8);
@@ -646,9 +542,6 @@ void Init_oci8_win32(VALUE cOCI8);
 void oci8_install_hook_functions(void);
 void oci8_shutdown_sockets(void);
 
-#ifdef HAVE_TYPE_RB_ENCODING
-extern rb_encoding *oci8_encoding;
-
 #define OCI8StringValue(v) do { \
     StringValue(v); \
     (v) = rb_str_export_to_enc(v, oci8_encoding); \
@@ -657,10 +550,6 @@ extern rb_encoding *oci8_encoding;
     SafeStringValue(v); \
     (v) = rb_str_export_to_enc(v, oci8_encoding); \
 } while (0)
-#else
-#define OCI8StringValue(v)     StringValue(v)
-#define OCI8SafeStringValue(v) SafeStringValue(v)
-#endif
 
 #include "thread_util.h"
 #include "apiwrap.h"