ruby-oci8 2.2.0.2 → 2.2.12

data/ext/oci8/oci8.c

@@ -2,7 +2,7 @@
 /*
  * oci8.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2019 Kubo Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -286,7 +286,7 @@ static VALUE oci8_s_oracle_client_vernum(VALUE klass)
 /*
  * @overload OCI8.__get_prop(key)
  *
- *  @param [Fixnum] key    1, 2 or 3
+ *  @param [Integer] key   1, 2 or 3
  *  @return [Object]       depends on +key+.
  *  @private
  */
@@ -306,16 +306,13 @@ static VALUE oci8_s_get_prop(VALUE klass, VALUE key)
 /*
  * @overload OCI8.__set_prop(key, value)
  *
- *  @param [Fixnum] key    1, 2 or 3
+ *  @param [Integer] key   1, 2 or 3
  *  @param [Object] value  depends on +key+.
  *
  *  @private
  */
 static VALUE oci8_s_set_prop(VALUE klass, VALUE key, VALUE val)
 {
-#ifdef HAVE_PLTHOOK
-    static int hook_functions_installed = 0;
-#endif
     switch (NUM2INT(key)) {
     case 1:
         oci8_float_conversion_type_is_ruby = RTEST(val) ? 1 : 0;
@@ -331,13 +328,21 @@ static VALUE oci8_s_set_prop(VALUE klass, VALUE key, VALUE val)
         oci8_env_mode = NUM2UINT(val);
         break;
     case 3:
+        if (oci8_cancel_read_at_exit == -1) {
+            rb_raise(rb_eNotImpError, "OCI8.properties[:cancel_read_at_exit] isn't available.");
+        }
 #ifdef HAVE_PLTHOOK
-        if (!hook_functions_installed) {
-            oci8_install_hook_functions();
-            hook_functions_installed = 1;
+        oci8_install_hook_functions();
+        oci8_cancel_read_at_exit = RTEST(val) ? 1 : 0;
+#endif
+        break;
+    case 4:
+        if (oci8_tcp_keepalive_time == -1) {
+            rb_raise(rb_eNotImpError, "OCI8.properties[:tcp_keepalive_time] isn't available.");
         }
-#else
-        rb_raise(rb_eNotImpError, ":cancel_read_at_exit isn't implemented on this machine.");
+#ifdef HAVE_PLTHOOK
+        oci8_install_hook_functions();
+        oci8_tcp_keepalive_time = NIL_P(val) ? 0 : NUM2INT(val);
 #endif
         break;
     default:
@@ -359,7 +364,7 @@ static VALUE oci8_s_set_prop(VALUE klass, VALUE key, 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
+ *  @param [Integer] message_no  Oracle error message number
  *  @return [String]             Oracle error message
  */
 static VALUE oci8_s_error_message(VALUE klass, VALUE msgid)
@@ -372,8 +377,8 @@ void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pass, VALU
 {
     static VALUE re = Qnil;
     if (NIL_P(re)) {
-        re = rb_eval_string(CONN_STR_REGEX);
         rb_global_variable(&re);
+        re = rb_eval_string(CONN_STR_REGEX);
     }
     OCI8SafeStringValue(conn_str);
     if (RTEST(rb_reg_match(re, conn_str))) {
@@ -419,49 +424,6 @@ static VALUE oci8_parse_connect_string(VALUE self, VALUE conn_str)
     return rb_ary_new3(4, user, pass, dbname, mode);
 }
 
-/*
- * Logoff strategy for sessions connected by OCILogon.
- */
-typedef struct {
-    OCISvcCtx *svchp;
-    OCISession *usrhp;
-    OCIServer *srvhp;
-} simple_logoff_arg_t;
-
-static void *simple_logoff_prepare(oci8_svcctx_t *svcctx)
-{
-    simple_logoff_arg_t *sla = xmalloc(sizeof(simple_logoff_arg_t));
-    sla->svchp = svcctx->base.hp.svc;
-    sla->usrhp = svcctx->usrhp;
-    sla->srvhp = svcctx->srvhp;
-    svcctx->usrhp = NULL;
-    svcctx->srvhp = NULL;
-    return sla;
-}
-
-static void *simple_logoff_execute(void *arg)
-{
-    simple_logoff_arg_t *sla = (simple_logoff_arg_t *)arg;
-    OCIError *errhp = oci8_errhp;
-    boolean txn = TRUE;
-    sword rv;
-
-    if (oracle_client_version >= ORAVER_12_1) {
-        OCIAttrGet(sla->usrhp, OCI_HTYPE_SESSION, &txn, NULL, OCI_ATTR_TRANSACTION_IN_PROGRESS, errhp);
-    }
-    if (txn) {
-        OCITransRollback(sla->svchp, errhp, OCI_DEFAULT);
-    }
-    rv = OCILogoff(sla->svchp, errhp);
-    xfree(sla);
-    return (void*)(VALUE)rv;
-}
-
-static const oci8_logoff_strategy_t simple_logoff = {
-    simple_logoff_prepare,
-    simple_logoff_execute,
-};
-
 /*
  * Logoff strategy for sessions connected by OCIServerAttach and OCISessionBegin.
  */
@@ -526,61 +488,6 @@ static const oci8_logoff_strategy_t complex_logoff = {
     complex_logoff_execute,
 };
 
-/*
- * @overload logon2(username, password, dbname, mode)
- *
- *  Creates a simple logon session by the OCI function OCILogon2().
- *
- *  @param [String] username
- *  @param [String] password
- *  @param [String] dbname
- *  @param [Integer] mode
- *  @private
- */
-static VALUE oci8_logon2(VALUE self, VALUE username, VALUE password, VALUE dbname, VALUE mode)
-{
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
-    ub4 logon2_mode;
-
-    if (svcctx->logoff_strategy != NULL) {
-        rb_raise(rb_eRuntimeError, "Could not reuse the session.");
-    }
-
-    /* check arugmnets */
-    OCI8SafeStringValue(username);
-    OCI8SafeStringValue(password);
-    if (!NIL_P(dbname)) {
-        OCI8SafeStringValue(dbname);
-    }
-    logon2_mode = NUM2UINT(mode);
-
-    /* logon */
-    svcctx->base.type = OCI_HTYPE_SVCCTX;
-    chker2(OCILogon2_nb(svcctx, oci8_envhp, oci8_errhp, &svcctx->base.hp.svc,
-                        RSTRING_ORATEXT(username), RSTRING_LEN(username),
-                        RSTRING_ORATEXT(password), RSTRING_LEN(password),
-                        NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                        NIL_P(dbname) ? 0 : RSTRING_LEN(dbname), logon2_mode),
-           &svcctx->base);
-    svcctx->logoff_strategy = &simple_logoff;
-
-    if (logon2_mode & OCI_LOGON2_CPOOL) {
-        svcctx->state |= OCI8_STATE_CPOOL;
-    }
-
-    /* setup the session handle */
-    chker2(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->usrhp, 0, OCI_ATTR_SESSION, oci8_errhp),
-           &svcctx->base);
-    copy_session_handle(svcctx);
-
-    /* setup the server handle */
-    chker2(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->srvhp, 0, OCI_ATTR_SERVER, oci8_errhp),
-           &svcctx->base);
-    copy_server_handle(svcctx);
-
-    return Qnil;
-}
-
 /*
  * @overload allocate_handles()
  *
@@ -649,7 +556,7 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
     /* attach to the server */
     chker2(OCIServerAttach_nb(svcctx, svcctx->srvhp, oci8_errhp,
                               NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                              NIL_P(dbname) ? 0 : RSTRING_LEN(dbname),
+                              NIL_P(dbname) ? 0 : RSTRING_LENINT(dbname),
                               mode),
            &svcctx->base);
     chker2(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX,
@@ -668,13 +575,15 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
  *
  *  Begins the session by the OCI function OCISessionBegin().
  *
- *  @param [Fixnum] cred
- *  @param [Fixnum] mode
+ *  @param [Integer] cred
+ *  @param [Integer] mode
  *  @private
  */
 static VALUE oci8_session_begin(VALUE self, VALUE cred, VALUE mode)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
+    char buf[100];
+    ub4 version;
 
     if (svcctx->logoff_strategy != &complex_logoff) {
         rb_raise(rb_eRuntimeError, "Use this method only for the service context handle created by OCI8#server_handle().");
@@ -697,6 +606,16 @@ static VALUE oci8_session_begin(VALUE self, VALUE cred, VALUE mode)
                       oci8_errhp),
            &svcctx->base);
     svcctx->state |= OCI8_STATE_SESSION_BEGIN_WAS_CALLED;
+    if (have_OCIServerRelease2) {
+        chker2(OCIServerRelease2(svcctx->base.hp.ptr, oci8_errhp, (text*)buf,
+                                 sizeof(buf), (ub1)svcctx->base.type, &version, OCI_DEFAULT),
+               &svcctx->base);
+    } else {
+        chker2(OCIServerRelease(svcctx->base.hp.ptr, oci8_errhp, (text*)buf,
+                                sizeof(buf), (ub1)svcctx->base.type, &version),
+               &svcctx->base);
+    }
+    svcctx->server_version = version;
     return Qnil;
 }
 
@@ -815,14 +734,9 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 /*
  * @overload long_read_len
  *
- *  Gets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column. The default value is 65535.
- *
- *  If the actual data length is longer than long_read_len,
- *  the fetched valud is truncated and the value of {OCI8#last_error}
- *  become {OCISuccessWithInfo} whose message is "ORA-01406: fetched column value was truncated".
- *
- *  Note: long_read_len is also used for maximum length of XMLTYPE data type.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @return [Integer]
  *  @see #long_read_len=
@@ -830,14 +744,16 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 static VALUE oci8_long_read_len(VALUE self)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
+    rb_warning("OCI8.long_read_len has no effect since ruby-oci8 2.2.7");
     return svcctx->long_read_len;
 }
 
 /*
  * @overload long_read_len=(length)
  *
- *  Sets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @param [Integer] length
  *  @see #long_read_len
@@ -847,6 +763,7 @@ static VALUE oci8_set_long_read_len(VALUE self, VALUE val)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
     Check_Type(val, T_FIXNUM);
     RB_OBJ_WRITE(self, &svcctx->long_read_len, val);
+    rb_warning("OCI8.long_read_len= has no effect since ruby-oci8 2.2.7");
     return val;
 }
 
@@ -889,11 +806,8 @@ static VALUE oci8_break(VALUE self)
 static VALUE oci8_oracle_server_vernum(VALUE self)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
-    char buf[100];
-    ub4 version;
 
-    chker2(OCIServerRelease(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), (ub1)svcctx->base.type, &version), &svcctx->base);
-    return UINT2NUM(version);
+    return UINT2NUM(svcctx->server_version);
 }
 
 /*
@@ -950,7 +864,7 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -985,7 +899,7 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -1019,7 +933,7 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -1050,7 +964,7 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -1102,7 +1016,6 @@ void Init_oci8(VALUE *out)
     rb_define_singleton_method_nodoc(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);
     rb_define_private_method(cOCI8, "allocate_handles", oci8_allocate_handles, 0);
     rb_define_private_method(cOCI8, "server_attach", oci8_server_attach, 2);
     rb_define_private_method(cOCI8, "session_begin", oci8_session_begin, 2);

data/ext/oci8/oci8.h

@@ -2,7 +2,7 @@
 /*
  * oci8.h - part of ruby-oci8
  *
- * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2016 Kubo Takehiro <kubo@jiubao.org>
  */
 #ifndef _RUBY_OCI_H_
 #define _RUBY_OCI_H_ 1
@@ -21,8 +21,23 @@ extern "C"
 }
 #endif
 
+/*
+ * Oracle version number format in 32-bit integer.
+ *
+ * Oracle 12c or earier                     Oracle 18c or later
+ *
+ * hexadecimal ->  dotted version number    hexadecimal ->  dotted version number
+ *  0c102304   ->  12.1.2.3.4                12012034   ->  18.1.2.3.4
+ *                 ^  ^ ^ ^ ^                               ^  ^ ^ ^ ^
+ *  0c ------------'  | | | |  2 bytes       12 ------------'  | | | |  2 bytes
+ *    1 --------------' | | |  1 byte          01 -------------' | | |  2 bytes
+ *     02 --------------' | |  2 bytes           2 --------------' | |  1 byte
+ *       3 ---------------' |  1 byte             03 --------------' |  2 bytes
+ *        04 ---------------'  2 bytes              4 ---------------'  1 byte
+ */
 #define ORAVERNUM(major, minor, update, patch, port_update) \
-    (((major) << 24) | ((minor) << 20) | ((update) << 12) | ((patch) << 8) | (port_update))
+    (((major) >= 18) ? (((major) << 24) | ((minor) << 16) | ((update) << 12) | ((patch) << 4) | (port_update)) \
+                     : (((major) << 24) | ((minor) << 20) | ((update) << 12) | ((patch) << 8) | (port_update)))
 
 #define ORAVER_8_0 ORAVERNUM(8, 0, 0, 0, 0)
 #define ORAVER_8_1 ORAVERNUM(8, 1, 0, 0, 0)
@@ -32,6 +47,7 @@ extern "C"
 #define ORAVER_10_2 ORAVERNUM(10, 2, 0, 0, 0)
 #define ORAVER_11_1 ORAVERNUM(11, 1, 0, 0, 0)
 #define ORAVER_12_1 ORAVERNUM(12, 1, 0, 0, 0)
+#define ORAVER_18 ORAVERNUM(18, 0, 0, 0, 0)
 
 #include "extconf.h"
 #include <ruby/encoding.h>
@@ -58,38 +74,6 @@ typedef oraub8 ub8;
 typedef orasb8 sb8;
 #endif /* ORAXB8_DEFINED */
 
-#ifndef HAVE_TYPE_ORATEXT
-typedef unsigned char oratext;
-#endif
-#if !defined HAVE_TYPE_OCIDATETIME_ && !defined HAVE_TYPE_OCIDATETIMEP
-typedef struct OCIDateTime OCIDateTime;
-#endif
-#if !defined HAVE_TYPE_OCIINTERVAL_ && !defined HAVE_TYPE_OCIINTERVALP
-typedef struct OCIInterval OCIInterval;
-#endif
-#ifndef HAVE_TYPE_OCICALLBACKLOBREAD2
-typedef sb4 (*OCICallbackLobRead2)(dvoid *ctxp, CONST dvoid *bufp, oraub8 len,
-                                   ub1 piece, dvoid **changed_bufpp,
-                                   oraub8 *changed_lenp);
-#endif
-#ifndef HAVE_TYPE_OCICALLBACKLOBWRITE2
-typedef sb4 (*OCICallbackLobWrite2)(dvoid *ctxp, dvoid *bufp, oraub8 *lenp,
-                                    ub1 *piece, dvoid **changed_bufpp,
-                                    oraub8 *changed_lenp);
-#endif
-#if !defined HAVE_TYPE_OCIADMIN_ && !defined HAVE_TYPE_OCIADMINP
-typedef struct OCIAdmin OCIAdmin;
-#endif
-#if !defined HAVE_TYPE_OCIAUTHINFO_ && !defined HAVE_TYPE_OCIAUTHINFOP
-typedef struct OCIAuthInfo OCIAuthInfo;
-#endif
-#if !defined HAVE_TYPE_OCIMSG_ && !defined HAVE_TYPE_OCIMSGP
-typedef struct OCIMsg  OCIMsg;
-#endif
-#if !defined HAVE_TYPE_OCICPOOL_ && !defined HAVE_TYPE_OCICPOOLP
-typedef struct OCICPool OCICPool;
-#endif
-
 #if defined RBX_CAPI_RUBY_H
 /* rubinius 2.0 */
 #ifndef HAVE_RB_ENC_STR_BUF_CAT
@@ -105,76 +89,9 @@ typedef struct OCICPool OCICPool;
 #endif
 #endif
 
-/*
- * Use TypedData on ruby 1.9.3 and later.
- */
-#ifndef HAVE_RB_DATA_TYPE_T_FUNCTION
-
-/*
- * Don't use TypedData even though ruby 1.9.2 has it because the
- * definitions are slightly different from ruby 1.9.3 and later.
- */
-#define rb_data_type_t oci8_data_type_t
-#undef TypedData_Make_Struct
-#undef TypedData_Wrap_Struct
-#undef TypedData_Get_Struct
-#undef RTYPEDDATA_DATA
-#undef RUBY_DEFAULT_FREE
-
-/*
- * To pass compilation on ruby 1.9.2 and earlier.
- */
-typedef struct oci8_data_type_struct rb_data_type_t;
-struct oci8_data_type_struct {
-    const char *wrap_struct_name;
-    struct {
-        void (*dmark)(void*);
-        void (*dfree)(void*);
-        size_t (*dsize)(const void *);
-    } function;
-    const rb_data_type_t *parent;
-    void *data;
-};
-#define TypedData_Make_Struct(klass, type, data_type, sval) \
-             Data_Make_Struct((klass), type, (data_type)->function.dmark, (data_type)->function.dfree, (sval))
-#define TypedData_Wrap_Struct(klass, data_type, sval) \
-             Data_Wrap_Struct((klass), (data_type)->function.dmark, (data_type)->function.dfree, (sval))
-#define TypedData_Get_Struct(obj, type, data_type, sval) \
-             Data_Get_Struct((obj), type, (sval))
-#define RTYPEDDATA_DATA(obj) DATA_PTR(obj)
-#define RUBY_DEFAULT_FREE xfree
-#endif
-
-/* a new function in ruby 1.9.3.
- * define a compatible macro for ruby 1.9.2 or lower.
- */
-#ifndef HAVE_RB_CLASS_SUPERCLASS
-#ifdef RCLASS_SUPER
-#define rb_class_superclass(cls) RCLASS_SUPER(cls)
-#else
-#define rb_class_superclass(cls) (RCLASS(cls)->super)
-#endif
-#endif
-
-/* new macros in ruby 2.1.0
- */
-#ifndef RARRAY_AREF
-#define RARRAY_AREF(a, i)    (RARRAY_PTR(a)[i])
-#endif
-#ifndef RARRAY_CONST_PTR
-#define RARRAY_CONST_PTR(a)  RARRAY_PTR(a)
-#endif
-#ifndef RB_OBJ_WRITE
-#define RB_OBJ_WRITE(a, slot, b)   do {*(slot) = (b);} while (0)
-#endif
-#ifndef RB_OBJ_WRITTEN
-#define RB_OBJ_WRITTEN(a, oldv, b) do {(void)oldv;} while (0)
-#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.
- *  ALWAYS_INLINE  forcely inline the function.
  */
 #if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
 /* gcc version >= 2.96 */
@@ -185,14 +102,6 @@ struct oci8_data_type_struct {
 #define LIKELY(x)   (x)
 #define UNLIKELY(x) (x)
 #endif
-#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-/* gcc version >= 3.1 */
-#define ALWAYS_INLINE inline __attribute__((always_inline))
-#endif
-#ifdef _MSC_VER
-/* microsoft c */
-#define ALWAYS_INLINE __forceinline
-#endif
 
 /* macros to access thread-local storage.
  *
@@ -218,27 +127,24 @@ struct oci8_data_type_struct {
 /* utility macros
  */
 #define IS_OCI_ERROR(v) (((v) != OCI_SUCCESS) && ((v) != OCI_SUCCESS_WITH_INFO))
-#ifdef ALWAYS_INLINE
 #define TO_ORATEXT to_oratext
 #define TO_CONST_ORATEXT to_const_oratext
 #define TO_CHARPTR to_charptr
-static ALWAYS_INLINE OraText *to_oratext(char *c)
+ALWAYS_INLINE(static OraText *to_oratext(char *c));
+static inline OraText *to_oratext(char *c)
 {
     return (OraText*)c;
 }
-static ALWAYS_INLINE const OraText *to_const_oratext(const char *c)
+ALWAYS_INLINE(static const OraText *to_const_oratext(const char *c));
+static inline const OraText *to_const_oratext(const char *c)
 {
     return (const OraText*)c;
 }
-static ALWAYS_INLINE char *to_charptr(OraText *c)
+ALWAYS_INLINE(static char *to_charptr(OraText *c));
+static inline char *to_charptr(OraText *c)
 {
     return (char*)c;
 }
-#else
-#define TO_ORATEXT(c) ((OraText*)(c))
-#define TO_CONST_ORATEXT(c) ((const OraText*)(c))
-#define TO_CHARPTR(c) ((char*)(c))
-#endif
 #define RSTRING_ORATEXT(obj) TO_ORATEXT(RSTRING_PTR(obj))
 #define rb_str_new2_ora(str) rb_str_new2(TO_CHARPTR(str))
 
@@ -344,6 +250,7 @@ typedef struct oci8_svcctx {
     const oci8_logoff_strategy_t *logoff_strategy;
     OCISession *usrhp;
     OCIServer *srvhp;
+    ub4 server_version;
     rb_pid_t pid;
     unsigned char state;
     char is_autocommit;
@@ -368,7 +275,8 @@ typedef struct {
 } oci8_exec_sql_var_t;
 
 #define oci8_raise(err, status, stmt) oci8_do_raise(err, status, stmt, __FILE__, __LINE__)
-#define oci8_env_raise(err, status) oci8_do_env_raise(err, status, __FILE__, __LINE__)
+#define oci8_env_raise(env, status) oci8_do_env_raise(env, status, 0, __FILE__, __LINE__)
+#define oci8_env_free_and_raise(env, status) oci8_do_env_raise(env, status, 1, __FILE__, __LINE__)
 #define oci8_raise_init_error() oci8_do_raise_init_error(__FILE__, __LINE__)
 #define oci8_raise_by_msgno(msgno, default_msg) oci8_do_raise_by_msgno(msgno, default_msg, __FILE__, __LINE__)
 
@@ -392,7 +300,7 @@ OCIEnv *oci8_make_envhp(void);
 extern oci8_tls_key_t oci8_tls_key; /* native thread key */
 OCIError *oci8_make_errhp(void);
 
-static inline OCIError *oci8_get_errhp()
+static inline OCIError *oci8_get_errhp(void)
 {
     OCIError *errhp = (OCIError *)oci8_tls_get(oci8_tls_key);
     return LIKELY(errhp != NULL) ? errhp : oci8_make_errhp();
@@ -434,7 +342,8 @@ void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type,
 extern VALUE eOCIException;
 extern VALUE eOCIBreak;
 void Init_oci8_error(void);
-NORETURN(void oci8_do_env_raise(OCIEnv *, sword status, const char *file, int line));
+NORETURN(void oci8_do_raise(OCIError *errhp, sword status, OCIStmt *stmthp, const char *file, int line));
+NORETURN(void oci8_do_env_raise(OCIEnv *envhp, sword status, int free_envhp, const char *file, int line));
 NORETURN(void oci8_do_raise_init_error(const char *file, int line));
 sb4 oci8_get_error_code(OCIError *errhp);
 VALUE oci8_get_error_message(ub4 msgno, const char *default_msg);
@@ -474,6 +383,7 @@ void Init_oci8_bind(VALUE cOCI8BindTypeBase);
 
 /* metadata.c */
 extern const oci8_handle_data_type_t oci8_metadata_base_data_type;
+VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype, VALUE klass, VALUE check_public);
 void Init_oci8_metadata(VALUE cOCI8);
 VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent);
 
@@ -515,8 +425,8 @@ OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp);
 void Init_oci_datetime(void);
 VALUE oci8_make_ocidate(OCIDate *od);
 OCIDate *oci8_set_ocidate(OCIDate *od, VALUE val);
-VALUE oci8_make_ocidatetime(OCIDateTime *dttm);
-OCIDateTime *oci8_set_ocidatetime(OCIDateTime *dttm, VALUE val);
+VALUE oci8_make_ocitimestamp(OCIDateTime *dttm, boolean have_tz);
+OCIDateTime *oci8_set_ocitimestamp_tz(OCIDateTime *dttm, VALUE val, VALUE svc);
 VALUE oci8_make_interval_ym(OCIInterval *s);
 VALUE oci8_make_interval_ds(OCIInterval *s);
 
@@ -541,6 +451,13 @@ void Init_oci8_win32(VALUE cOCI8);
 /* hook_funcs.c */
 void oci8_install_hook_functions(void);
 void oci8_shutdown_sockets(void);
+#ifdef HAVE_PLTHOOK
+extern int oci8_cancel_read_at_exit;
+extern int oci8_tcp_keepalive_time;
+#else
+#define oci8_cancel_read_at_exit (-1)
+#define oci8_tcp_keepalive_time (-1)
+#endif
 
 #define OCI8StringValue(v) do { \
     StringValue(v); \