ruby-oci8 2.2.4.1 → 2.2.11

data/ext/oci8/object.c

@@ -44,6 +44,8 @@ enum {
     ATTR_FLOAT,
     ATTR_INTEGER,
     ATTR_OCIDATE,
+    ATTR_TIMESTAMP,
+    ATTR_TIMESTAMP_TZ,
     ATTR_BINARY_DOUBLE,
     ATTR_BINARY_FLOAT,
     ATTR_NAMED_TYPE,
@@ -235,6 +237,10 @@ static VALUE get_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *dat
         return oci8_make_integer((OCINumber *)data, oci8_errhp);
     case ATTR_OCIDATE:
         return oci8_make_ocidate((OCIDate *)data);
+    case ATTR_TIMESTAMP:
+        return oci8_make_ocitimestamp(*(OCIDateTime**)data, FALSE);
+    case ATTR_TIMESTAMP_TZ:
+        return oci8_make_ocitimestamp(*(OCIDateTime**)data, TRUE);
     case ATTR_BINARY_DOUBLE:
         return rb_float_new(*(double*)data);
     case ATTR_BINARY_FLOAT:
@@ -413,6 +419,18 @@ static VALUE oci8_named_coll_set_coll_element(VALUE self, VALUE datatype, VALUE
     case ATTR_OCIDATE:
         cb_data.indp = &cb_data.ind;
         break;
+    case ATTR_TIMESTAMP:
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_TIMESTAMP, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
+        chker2(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp),
+               svcctx);
+        break;
+    case ATTR_TIMESTAMP_TZ:
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_TIMESTAMP_TZ, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
+        chker2(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp),
+               svcctx);
+        break;
     case ATTR_BINARY_DOUBLE:
         cb_data.data.dbl = 0.0;
         cb_data.indp = &cb_data.ind;
@@ -467,7 +485,7 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
 
     chkerr(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
     if (RARRAY_LEN(val) < size) {
-        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, size - RARRAY_LEN(val), coll));
+        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, (sb4)(size - RARRAY_LEN(val)), coll));
     }
     for (idx = 0; idx < RARRAY_LEN(val); idx++) {
         switch (FIX2INT(datatype)) {
@@ -507,6 +525,8 @@ static VALUE set_coll_element_ensure(set_coll_element_cb_data_t *cb_data)
     switch (FIX2INT(datatype)) {
     case ATTR_STRING:
     case ATTR_RAW:
+    case ATTR_TIMESTAMP:
+    case ATTR_TIMESTAMP_TZ:
     case ATTR_NAMED_TYPE:
     case ATTR_NAMED_COLLECTION:
         if (cb_data->data.ptr != NULL) {
@@ -539,13 +559,13 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_STRING:
         OCI8StringValue(val);
         chkerr(OCIStringAssignText(oci8_envhp, oci8_errhp,
-                                   RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                   RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                    (OCIString **)data));
         break;
     case ATTR_RAW:
         StringValue(val);
         chkerr(OCIRawAssignBytes(oci8_envhp, oci8_errhp,
-                                 RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                 RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                  (OCIRaw **)data));
         break;
     case ATTR_OCINUMBER:
@@ -558,6 +578,12 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_OCIDATE:
         oci8_set_ocidate((OCIDate*)data, val);
         break;
+    case ATTR_TIMESTAMP:
+        oci8_set_ocitimestamp_tz(*(OCIDateTime **)data, val, Qnil);
+        break;
+    case ATTR_TIMESTAMP_TZ:
+        oci8_set_ocitimestamp_tz(*(OCIDateTime **)data, val, Qnil);
+        break;
     case ATTR_BINARY_DOUBLE:
         *(double*)data = NUM2DBL(val);
         break;
@@ -654,45 +680,57 @@ static VALUE oci8_named_collection_alloc(VALUE klass)
     return oci8_allocate_typeddata(klass, &oci8_named_collection_data_type);
 }
 
+typedef struct {
+    oci8_bind_t bind;
+    VALUE *obj;
+} bind_named_type_t;
+
 static void bind_named_type_mark(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
 
-    if (oho != NULL) {
+    if (bnt->obj != NULL) {
         ub4 idx = 0;
 
         do {
-            rb_gc_mark(oho[idx].obj);
-        } while (++idx < obind->maxar_sz);
+            rb_gc_mark(bnt->obj[idx]);
+        } while (++idx < bnt->bind.maxar_sz);
     }
-    rb_gc_mark(obind->tdo);
+    rb_gc_mark(bnt->bind.tdo);
 }
 
 static void bind_named_type_free(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
+    void **hp = (void **)bnt->bind.valuep;
 
-    if (oho != NULL) {
+    if (hp != NULL) {
         ub4 idx = 0;
 
         do {
-            if (oho[idx].hp != NULL) {
-                OCIObjectFree(oci8_envhp, oci8_errhp, oho[idx].hp, OCI_DEFAULT);
-                oho[idx].hp = NULL;
+            if (hp[idx] != NULL) {
+                OCIObjectFree(oci8_envhp, oci8_errhp, hp[idx], OCI_DEFAULT);
+                hp[idx] = NULL;
             }
-        } while (++idx < obind->maxar_sz);
+        } while (++idx < bnt->bind.maxar_sz);
+    }
+    if (bnt->obj != NULL) {
+        xfree(bnt->obj);
+        bnt->obj = NULL;
     }
     oci8_bind_free(base);
 }
 
 static VALUE bind_named_type_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)data;
-    return oho->obj;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    ub4 idx = obind->curar_idx;
+
+    return bnt->obj[idx];
 }
 
+NORETURN(static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val));
+
 static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     rb_raise(rb_eRuntimeError, "not supported");
@@ -700,10 +738,12 @@ static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_stru
 
 static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
 {
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
     VALUE tdo_obj = length;
 
     obind->value_sz = sizeof(void*);
-    obind->alloc_sz = sizeof(oci8_hp_obj_t);
+    obind->alloc_sz = sizeof(void*);
+    bnt->obj = xcalloc(sizeof(VALUE), obind->maxar_sz ? obind->maxar_sz : 1);
 
     CHECK_TDO(tdo_obj);
     RB_OBJ_WRITE(obind->base.self, &obind->tdo, tdo_obj);
@@ -711,7 +751,8 @@ static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE
 
 static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    void **hp = (void **)obind->valuep;
     oci8_base_t *tdo = DATA_PTR(obind->tdo);
     OCITypeCode tc = OCITypeTypeCode(oci8_envhp, oci8_errhp, tdo->hp.tdo);
     VALUE klass = Qnil;
@@ -729,14 +770,14 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
     }
     svcctx = oci8_get_svcctx(svc);
     do {
-        oho[idx].obj = rb_class_new_instance(0, NULL, klass);
-        RB_OBJ_WRITTEN(obind->base.self, Qundef, oho[idx].obj);
-        obj = DATA_PTR(oho[idx].obj);
-        RB_OBJ_WRITE(oho[idx].obj, &obj->tdo, obind->tdo);
-        obj->instancep = (char**)&oho[idx].hp;
+        bnt->obj[idx] = rb_class_new_instance(0, NULL, klass);
+        RB_OBJ_WRITTEN(obind->base.self, Qundef, bnt->obj[idx]);
+        obj = DATA_PTR(bnt->obj[idx]);
+        RB_OBJ_WRITE(bnt->obj[idx], &obj->tdo, obind->tdo);
+        obj->instancep = (char**)&hp[idx];
         obj->null_structp = (char**)&obind->u.null_structs[idx];
         oci8_link_to_parent(&obj->base, &obind->base);
-        RB_OBJ_WRITTEN(oho[idx].obj, Qundef, obind->base.self);
+        RB_OBJ_WRITTEN(bnt->obj[idx], Qundef, obind->base.self);
 
         chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep),
                &svcctx->base);
@@ -778,7 +819,7 @@ static const oci8_bind_data_type_t bind_named_type_data_type = {
 #endif
         },
         bind_named_type_free,
-        sizeof(oci8_bind_t)
+        sizeof(bind_named_type_t)
     },
     bind_named_type_get,
     bind_named_type_set,
@@ -818,6 +859,10 @@ void Init_oci_object(VALUE cOCI8)
     /* @private */
     rb_define_const(cOCI8TDO, "ATTR_OCIDATE", INT2FIX(ATTR_OCIDATE));
     /* @private */
+    rb_define_const(cOCI8TDO, "ATTR_TIMESTAMP", INT2FIX(ATTR_TIMESTAMP));
+    /* @private */
+    rb_define_const(cOCI8TDO, "ATTR_TIMESTAMP_TZ", INT2FIX(ATTR_TIMESTAMP_TZ));
+    /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BINARY_DOUBLE", INT2FIX(ATTR_BINARY_DOUBLE));
     /* @private */
     rb_define_const(cOCI8TDO, "ATTR_BINARY_FLOAT", INT2FIX(ATTR_BINARY_FLOAT));

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"
@@ -424,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.
  */
@@ -531,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()
  *
@@ -654,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,
@@ -680,6 +582,8 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
 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().");
@@ -702,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;
 }
 
@@ -820,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=
@@ -835,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
@@ -852,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;
 }
 
@@ -894,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);
 }
 
 /*
@@ -955,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;
@@ -990,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;
@@ -1024,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;
@@ -1055,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;
@@ -1107,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

@@ -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>
@@ -316,6 +332,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;
@@ -407,6 +424,7 @@ 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_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);
@@ -489,8 +507,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);