ruby-oci8 2.1.8 → 2.2.0.1

data/ext/oci8/oci8lib.c

@@ -82,8 +82,24 @@ Init_oci8lib()
 
 #ifdef RUNTIME_API_CHECK
     Init_oci8_apiwrap();
-    if (oracle_client_version < ORAVER_9_0) {
-        rb_raise(rb_eLoadError, "Oracle 8 (8.0) and Oracle 8i (8.1) is not supported anymore!");
+    if (oracle_client_version < ORAVER_10_1) {
+        const char *oraver;
+        const char *ruby_oci8_ver;
+        if (oracle_client_version >= ORAVER_9_2) {
+            oraver = "9iR2";
+            ruby_oci8_ver = "2.1.x";
+        } else if (oracle_client_version >= ORAVER_9_0) {
+            oraver = "9iR1";
+            ruby_oci8_ver = "2.1.x";
+        } else if (oracle_client_version >= ORAVER_8_1) {
+            oraver = "8i";
+            ruby_oci8_ver = "2.0.x";
+        } else {
+            oraver = "8";
+            ruby_oci8_ver = "2.0.x";
+        }
+        rb_raise(rb_eLoadError, "Ruby-oci8 %s doesn't support Oracle %s. Use ruby-oci8 %s instead.",
+                 OCI8LIB_VERSION, oraver, ruby_oci8_ver);
     }
 
     if (have_OCIClientVersion) {
@@ -135,6 +151,9 @@ Init_oci8lib()
     Init_oci8_metadata(cOCI8);
     Init_oci8_lob(cOCI8);
 
+    /* OCI8::Util */
+    Init_oci8_util(cOCI8);
+
     /* allocate a temporary errhp to pass Init_oci_number() */
     rv = OCIEnvCreate(&envhp, oci8_env_mode, NULL, NULL, NULL, NULL, 0, NULL);
     if (rv != OCI_SUCCESS) {
@@ -223,8 +242,6 @@ void oci8_unlink_from_parent(oci8_base_t *base)
     base->parent = NULL;
 }
 
-#ifdef NATIVE_THREAD_WITH_GVL
-
 static void oci8_unblock_func(void *user_data)
 {
     oci8_svcctx_t *svcctx = (oci8_svcctx_t *)user_data;
@@ -275,7 +292,6 @@ static VALUE protected_call(VALUE data)
     return rv;
 }
 
-/* ruby 1.9 */
 sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *data)
 {
     OCIError *errhp = oci8_errhp;
@@ -330,66 +346,6 @@ sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *
         return (sword)(VALUE)func(data);
     }
 }
-#else /* NATIVE_THREAD_WITH_GVL */
-
-/* ruby 1.8 */
-typedef struct {
-    oci8_svcctx_t *svcctx;
-    void *(*func)(void *);
-    void *data;
-} blocking_region_arg_t;
-
-static VALUE blocking_function_execute(blocking_region_arg_t *arg)
-{
-    oci8_svcctx_t *svcctx = arg->svcctx;
-    void *(*func)(void *) = arg->func;
-    void *data = arg->data;
-    struct timeval tv;
-    sword rv;
-
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    svcctx->executing_thread = rb_thread_current();
-    while ((rv = (sword)(VALUE)func(data)) == OCI_STILL_EXECUTING) {
-        rb_thread_wait_for(tv);
-        if (tv.tv_usec < 500000)
-            tv.tv_usec <<= 1;
-    }
-    if (rv == OCI_ERROR) {
-        if (oci8_get_error_code(oci8_errhp) == 1013) {
-            OCIReset(svcctx->base.hp.ptr, oci8_errhp);
-            svcctx->executing_thread = Qnil;
-            rb_raise(eOCIBreak, "Canceled by user request.");
-        }
-    }
-    svcctx->executing_thread = Qnil;
-    return rv;
-}
-
-static VALUE blocking_function_ensure(oci8_svcctx_t *svcctx)
-{
-    if (!NIL_P(svcctx->executing_thread)) {
-        /* The thread is killed. */
-        OCIBreak(svcctx->base.hp.ptr, oci8_errhp);
-        OCIReset(svcctx->base.hp.ptr, oci8_errhp);
-        svcctx->executing_thread = Qnil;
-    }
-    return Qnil;
-}
-
-sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *data)
-{
-    blocking_region_arg_t arg;
-
-    arg.svcctx = svcctx;
-    arg.func = func;
-    arg.data = data;
-    if (!NIL_P(svcctx->executing_thread)) {
-        rb_raise(rb_eRuntimeError, "executing in another thread");
-    }
-    return (sword)rb_ensure(blocking_function_execute, (VALUE)&arg, blocking_function_ensure, (VALUE)svcctx);
-}
-#endif /* NATIVE_THREAD_WITH_GVL */
 
 typedef struct {
     oci8_svcctx_t *svcctx;
@@ -433,8 +389,9 @@ static VALUE exec_sql(cb_arg_t *arg)
     if (rv != OCI_SUCCESS) {
         oci8_env_raise(oci8_envhp, rv);
     }
-    chker2(OCIStmtPrepare(arg->stmtp, oci8_errhp, (text*)arg->sql_text,
-                          strlen(arg->sql_text), OCI_NTV_SYNTAX, OCI_DEFAULT),
+    chker2(OCIStmtPrepare2(arg->svcctx->base.hp.svc, &arg->stmtp, oci8_errhp, 
+                           (text*)arg->sql_text, strlen(arg->sql_text), NULL, 0,
+                           OCI_NTV_SYNTAX, OCI_DEFAULT),
            &arg->svcctx->base);
     for (pos = 0; pos < arg->num_define_vars; pos++) {
         arg->define_vars[pos].hp = NULL;
@@ -473,7 +430,7 @@ static VALUE exec_sql(cb_arg_t *arg)
 static VALUE ensure_func(cb_arg_t *arg)
 {
     if (arg->stmtp != NULL) {
-        OCIHandleFree(arg->stmtp, OCI_HTYPE_STMT);
+        OCIStmtRelease(arg->stmtp, oci8_errhp, NULL, 0, OCI_DEFAULT);
     }
     return Qnil;
 }
@@ -558,7 +515,7 @@ void *oci8_find_symbol(const char *symbol_name)
         }
         if (handle == NULL) {
             VALUE msg;
-            const char *ary = RARRAY_CONST_PTR(err);
+            const VALUE *arr = RARRAY_CONST_PTR(err);
 
             msg = rb_str_buf_new(NUM_SONAMES * 50);
             for (idx = 0; idx < NUM_SONAMES; idx++) {

data/ext/oci8/ocidatetime.c

@@ -354,26 +354,8 @@ OCIInterval *oci8_set_ociinterval_ym(OCIInterval *intvl, VALUE val)
     }
     year = NUM2INT(RARRAY_AREF(val, 0));
     month = NUM2INT(RARRAY_AREF(val, 1));
-    if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0)) {
-        chkerr(OCIIntervalSetYearMonth(oci8_envhp, oci8_errhp,
-                                       year, month, intvl));
-    } else {
-        /* Workaround for Bug 2227982 */
-        char buf[64];
-        const char *sign = "";
-
-        if (year < 0 && month != 0) {
-            year += 1;
-            month -= 12;
-        }
-        if (year < 0 || month < 0) {
-            sign = "-";
-            year = -year;
-            month = -month;
-        }
-        sprintf(buf, "%s%d-%d", sign, year, month);
-        chkerr(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
-    }
+    chkerr(OCIIntervalSetYearMonth(oci8_envhp, oci8_errhp,
+                                   year, month, intvl));
     return intvl;
 }
 
@@ -409,32 +391,8 @@ OCIInterval *oci8_set_ociinterval_ds(OCIInterval *intvl, VALUE val)
     minute = NUM2INT(RARRAY_AREF(val, 2));
     sec = NUM2INT(RARRAY_AREF(val, 3));
     fsec = NUM2INT(RARRAY_AREF(val, 4));
-    if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0)) {
-        chkerr(OCIIntervalSetDaySecond(oci8_envhp, oci8_errhp,
-                                       day, hour, minute, sec, fsec, intvl));
-    } else {
-        /* Workaround for Bug 2227982 */
-        char buf[64];
-        const char *sign = "";
-
-        if (day == 0) {
-            if (hour < 0) {
-                sign = "-";
-                hour = -hour;
-            } else if (minute < 0) {
-                sign = "-";
-                minute = -minute;
-            } else if (sec < 0) {
-                sign = "-";
-                sec = -sec;
-            } else if (fsec < 0) {
-                sign = "-";
-                fsec = -fsec;
-            }
-        }
-        sprintf(buf, "%s%d %02d:%02d:%02d.%09d", sign, day, hour, minute, sec, fsec);
-        chkerr(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
-    }
+    chkerr(OCIIntervalSetDaySecond(oci8_envhp, oci8_errhp,
+                                   day, hour, minute, sec, fsec, intvl));
     return intvl;
 }
 

data/ext/oci8/ocinumber.c

@@ -11,12 +11,6 @@
 #include <math.h>
 #include "oranumber_util.h"
 
-#ifndef RB_NUM_COERCE_FUNCS_NEED_OPID
-/* ruby 1.8 */
-#define rb_num_coerce_cmp(x, y, id) rb_num_coerce_cmp((x), (y))
-#define rb_num_coerce_bin(x, y, id) rb_num_coerce_bin((x), (y))
-#endif
-
 int oci8_float_conversion_type_is_ruby = 1;
 
 #ifndef INFINITY
@@ -32,9 +26,7 @@ static ID id_denominator;
 static ID id_Rational;
 static ID id_BigDecimal;
 
-#ifndef rb_Rational2
 static VALUE cRational;
-#endif
 static VALUE cBigDecimal;
 
 static VALUE cOCINumber;
@@ -52,11 +44,6 @@ static OCINumber const_mPI2; /* -PI/2 */
 #endif
 #define RBOCI8_T_ORANUMBER (T_MASK + 1)
 #define RBOCI8_T_BIGDECIMAL (T_MASK + 2)
-#ifdef rb_Rational2
-#define RBOCI8_T_RATIONAL T_RATIONAL
-#else
-#define RBOCI8_T_RATIONAL (T_MASK + 3)
-#endif
 
 static int rboci8_type(VALUE obj)
 {
@@ -64,21 +51,19 @@ static int rboci8_type(VALUE obj)
     VALUE klass;
 
     switch (type) {
-#ifndef rb_Rational2
     case T_OBJECT:
         klass = CLASS_OF(obj);
         if (cRational != 0) {
             if (klass == cRational) {
-                return RBOCI8_T_RATIONAL;
+                return T_RATIONAL;
             }
         } else {
             if (strcmp(rb_class2name(klass), "Rational") == 0) {
                 cRational = rb_const_get(rb_cObject, id_Rational);
-                return RBOCI8_T_RATIONAL;
+                return T_RATIONAL;
             }
         }
         break;
-#endif
     case T_DATA:
         klass = CLASS_OF(obj);
         if (klass == cOCINumber) {
@@ -866,7 +851,7 @@ static VALUE onum_coerce(VALUE self, VALUE other)
         return rb_assoc_new(oci8_make_ocinumber(&n, oci8_errhp), self);
     case T_FLOAT:
         return rb_assoc_new(other, onum_to_f(self));
-    case RBOCI8_T_RATIONAL:
+    case T_RATIONAL:
         return rb_assoc_new(other, onum_to_r(self));
     case RBOCI8_T_BIGDECIMAL:
         return rb_assoc_new(other, onum_to_d(self));
@@ -925,7 +910,7 @@ static VALUE onum_add(VALUE lhs, VALUE rhs)
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_add_op, 1, rhs);
-    case RBOCI8_T_RATIONAL:
+    case T_RATIONAL:
         return rb_funcall(onum_to_r(lhs), oci8_id_add_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
         return rb_funcall(onum_to_d(lhs), oci8_id_add_op, 1, rhs);
@@ -966,7 +951,7 @@ static VALUE onum_sub(VALUE lhs, VALUE rhs)
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_sub_op, 1, rhs);
-    case RBOCI8_T_RATIONAL:
+    case T_RATIONAL:
         return rb_funcall(onum_to_r(lhs), oci8_id_sub_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
         return rb_funcall(onum_to_d(lhs), oci8_id_sub_op, 1, rhs);
@@ -1007,7 +992,7 @@ static VALUE onum_mul(VALUE lhs, VALUE rhs)
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_mul_op, 1, rhs);
-    case RBOCI8_T_RATIONAL:
+    case T_RATIONAL:
         return rb_funcall(onum_to_r(lhs), oci8_id_mul_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
         return rb_funcall(onum_to_d(lhs), oci8_id_mul_op, 1, rhs);
@@ -1056,7 +1041,7 @@ static VALUE onum_div(VALUE lhs, VALUE rhs)
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_div_op, 1, rhs);
-    case RBOCI8_T_RATIONAL:
+    case T_RATIONAL:
         return rb_funcall(onum_to_r(lhs), oci8_id_div_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
         return rb_funcall(onum_to_d(lhs), oci8_id_div_op, 1, rhs);
@@ -1439,15 +1424,7 @@ static VALUE onum_to_r(VALUE self)
     } else {
         y = rb_funcall(INT2FIX(10), rb_intern("**"), 1, INT2FIX(nshift));
     }
-#ifdef rb_Rational2
     return rb_Rational(x, y);
-#else
-    if (!cRational) {
-        rb_require("rational");
-        cRational = rb_const_get(rb_cObject, id_Rational);
-    }
-    return rb_funcall(rb_cObject, id_Rational, 2, x, y);
-#endif
 }
 
 /*

data/ext/oci8/oraconf.rb

@@ -334,9 +334,10 @@ Backtrace:
   #{$!.backtrace.join("\n  ")}
 ---------------------------------------------------
 See:
- * http://rubydoc.info/gems/ruby-oci8/file/docs/install-full-client.md for Oracle full client
- * http://rubydoc.info/gems/ruby-oci8/file/docs/install-instant-client.md for Oracle instant client
- * http://ruby-oci8.rubyforge.org/en/file.report-installation-issue.html to report an issue.
+ * http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-full-client.md for Oracle full client
+ * http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-instant-client.md for Oracle instant client
+ * http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-on-osx.md for OS X
+ * http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/report-installation-issue.md to report an issue.
 
 EOS
       exc = RuntimeError.new
@@ -518,6 +519,64 @@ EOS
             end
           end
         end
+      when /darwin/
+        fallback_path = ENV['DYLD_FALLBACK_LIBRARY_PATH']
+        if fallback_path.nil?
+          fallback_path = "#{ENV['HOME']}/lib:/usr/local/lib:/lib:/usr/lib"
+        end
+        puts "  checking DYLD_FALLBACK_LIBRARY_PATH..."
+        ld_path, file = check_lib_in_path(fallback_path, glob_name, check_proc)
+        if ld_path.nil?
+          puts "  checking OCI_DIR..."
+          ld_path, file = check_lib_in_path(ENV['OCI_DIR'], glob_name, check_proc)
+          if ld_path
+            puts "  checking dependent shared libraries in #{file}..."
+            open("|otool -L #{file}") do |f|
+              f.gets # discard the first line
+              while line = f.gets
+                line =~ /^\s+(\S+)/
+                libname = $1
+                case libname
+                when /^@rpath\/libclntsh\.dylib/, /^@rpath\/libnnz\d\d\.dylib/, /^@loader_path\/libnnz\d\d\.dylib/
+                  # No need to check the real path.
+                  # The current instant client doesn't use @rpath or @loader_path.
+                when /\/libclntsh\.dylib/, /\/libnnz\d\d.dylib/
+                  raise <<EOS unless File.exists?(libname)
+The output of "otool -L #{file}" is:
+  | #{IO.readlines("|otool -L #{file}").join('  | ')}
+Ruby-oci8 doesn't work without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH
+because the dependent file "#{libname}" doesn't exist.
+
+If you need to use ruby-oci8 without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH,
+download "fix_oralib.rb" in https://github.com/kubo/fix_oralib_osx
+and execute it in the directory "#{File.dirname(file)}" as follows to fix the path.
+
+  cd #{File.dirname(file)}
+  curl -O https://raw.githubusercontent.com/kubo/fix_oralib_osx/master/fix_oralib.rb
+  ruby fix_oralib.rb
+
+Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
+EOS
+                end
+              end
+            end
+          end
+        end
+        if ld_path.nil?
+          raise <<EOS
+Set the environment variable DYLD_LIBRARY_PATH, DYLD_FALLBACK_LIBRARY_PATH or
+OCI_DIR to point to the Instant client directory.
+
+If DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH is set, the environment
+variable must be set at runtime also.
+
+If OCI_DIR is set, dependent shared library paths are checked. If the checking
+is passed, ruby-oci8 works without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH.
+
+Note: OCI_DIR should be absolute path.
+Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
+EOS
+        end
       end
     end
 
@@ -535,6 +594,7 @@ EOS
   end
 
   def self.check_lib_in_path(paths, glob_name, check_proc)
+    return nil if paths.nil?
     paths.split(File::PATH_SEPARATOR).each do |path|
       next if path.nil? or path == ''
       print "    checking #{path}... "
@@ -689,7 +749,7 @@ EOS
       case RUBY_PLATFORM
       when /solaris/
         " -L#{lib_dir} -R#{lib_dir} -lclntsh"
-      when /linux/
+      when /linux/,/darwin/
         " -L#{lib_dir} -Wl,-rpath,#{lib_dir} -lclntsh"
       else
         " -L#{lib_dir} -lclntsh"

data/ext/oci8/stmt.c

@@ -74,10 +74,10 @@ static VALUE oci8_stmt_initialize(VALUE self, VALUE svc, VALUE sql)
 
     svcctx = oci8_get_svcctx(svc);
     oci8_check_pid_consistency(svcctx);
-    if (!NIL_P(sql) && oracle_client_version >= ORAVER_9_2) {
+    if (!NIL_P(sql)) {
         OCI8SafeStringValue(sql);
 
-        rv = OCIStmtPrepare2_nb(svcctx, svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
+        rv = OCIStmtPrepare2(svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
         if (IS_OCI_ERROR(rv)) {
             chker2(rv, &svcctx->base);
         }
@@ -89,13 +89,6 @@ static VALUE oci8_stmt_initialize(VALUE self, VALUE svc, VALUE sql)
             oci8_env_raise(oci8_envhp, rv);
         }
         stmt->base.type = OCI_HTYPE_STMT;
-        if (!NIL_P(sql)) {
-            OCI8SafeStringValue(sql);
-            rv = OCIStmtPrepare(stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), OCI_NTV_SYNTAX, OCI_DEFAULT);
-            if (IS_OCI_ERROR(rv)) {
-                chker3(rv, &svcctx->base, stmt->base.hp.stmt);
-            }
-        }
     }
     RB_OBJ_WRITE(stmt->base.self, &stmt->svc, svc);
 

data/ext/oci8/thread_util.c

@@ -7,8 +7,6 @@
 #include "oci8.h"
 #include <errno.h>
 
-#ifdef USE_THREAD_LOCAL_ERRHP
-
 #ifndef WIN32
 #include <pthread.h>
 static pthread_attr_t detached_thread_attr;
@@ -81,5 +79,3 @@ int oci8_run_native_thread(void *(*func)(void *), void *arg)
     return rv;
 }
 #endif /* WIN32 */
-
-#endif /* USE_THREAD_LOCAL_ERRHP */