ruby-oci8 2.2.5.1 → 2.2.6

data/ChangeLog

@@ -1,3 +1,71 @@
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* NEWS: Add changes between 2.2.5.1 and 2.2.6
+	* lib/oci8/version.rb: Update to 2.2.6
+	* mkpkg-win32.rb: Don't test with self-build ruby 2.4.
+
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: Load a Oracle client library which doesn't have
+	    version number suffix also on Unix when runtime-check is enabled.
+	    Oracle version numbers are incremented yearly sice Oracle 18c.
+
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/hook_funcs.c, ext/oci8/win32.c: Suppress warnings:
+	   "'raise_error' defined but not used" and "'strncpy' specified
+	   bound 512 equals destination size".
+
+2018-08-19  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/hook_funcs.c: Not depend on Oracle version number
+	   of Oracle client file name suffix when hooking functions.
+	   (rsim/oracle-enhanced#1754)
+	* test/test_all.rb, test/test_properties.rb, dist-files:
+	   Add tests for hooking.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_oci8.rb: Fix to pass a test when the client is 11g
+	    and the server is 18c. client_driver in v$session_connect_info
+	    has an extra space at the end.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/apiwrap.rb, ext/oci8/apiwrap.yml, ext/oci8/oci8.c,
+	  ext/oci8/oci8.h, lib/oci8/oci8.rb, lib/oci8/oracle_version.rb,
+	  test/test_oci8.rb: Fix OCI8#oracle_server_version to get
+	    full version of Oracle 18c.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* lib/oci8/metadata.rb: Update doc comments of OCI8::Metadata::ArgBase#level
+	    and OCI8::Metadata::ArgBase#arguments.
+	* test/test_package_type.rb, lib/oci8.rb: Fix to pass tests on Oracle 18c.
+	    Detailed user-defined type information used in arguments isn't available
+	    on Oracle 18c.
+
+2018-08-12  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_clob.rb: Skip TestCLob#test_github_issue_20 because it
+	    takes 4 minutes to test it in my Linux box.
+
+2018-08-12  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/lob.c, test/test_clob.rb: LOB#sync, LOB#sync= and LOB#flush
+	    do nothing now. They have not worked by mistake from the beginning
+	    because incorrect arguments has been passed to OCILobOpen().
+	    Moreover it crashed Oracle 18c server-side processes and caused
+	    "ORA-03113: end-of-file on communication channel."
+	    (github issue #198)
+
+2018-01-28  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/object.c, lib/oci8/object.rb: Add timestamp with time zone
+	    data type support in object type attributes.
+	    (github issue #185)
+	* test/setup_test_object.sql, test/test_object.rb: Add tests for
+	    timestamp and timestamp with time zone.
+
+2018-01-23  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/object.c, ext/oci8/oci8.h, lib/oci8/object.rb:
+	    Add timestamp data type support in object type attributes.
+	    (github issue #185)
+
+2017-12-27  Kubo Takehiro <kubo@jiubao.org>
+	* mkpkg-win32.rb: Remove '-rubygems' in the command line to run tests.
+	    `ubygems.rb` was removed in ruby 2.5.
+
 2017-12-27  Kubo Takehiro <kubo@jiubao.org>
 	* NEWS: Add changes between 2.2.5 and 2.2.5.1
 	* lib/oci8/version.rb: Update to 2.2.5.1

data/NEWS

@@ -1,5 +1,44 @@
 # @markup markdown
 
+2.2.6
+=====
+
+This release fixed issues about Oracle 18c except one.
+
+Fixed issue
+-----------
+
+### Setting some properties failed with Oracle 18c client
+
+Setting `OCI8::properties[:tcp_keepalive_time]` or `OCI8::properties[:cancel_read_at_exit]`
+failed with the error message "No shared library is found to hook" when Oracle
+client version is 18c.
+(rsim/oracle-enhanced#1754)
+
+### Fix `OCI8#oracle_server_version` to get full version of Oracle 18c
+
+`OCI8#oracle_server_version` returned Oracle version number whose
+number components after the first dot are zeros such as '18.0.0.0.0'
+even when the server version is `18.3.0.0.0`. This issue was fixed by
+using a new OCI function. However the function is available since
+Oracle 18c client. So when the Oracle client version is 12c or earlier
+and the Oracle server version is 18c or later, it cannot get the *full*
+Oracle version number.
+
+### Fix tests when the Oracle server version is 18c.
+
+### LOB#sync, LOB#sync= and LOB#flush do nothing now.
+
+They have not worked by mistake from the beginning because incorrect
+arguments has been passed to OCILobOpen(). Moreover it crashed Oracle
+18c server-side processes and caused "ORA-03113: end-of-file on
+communication channel."
+(github issue #198)
+
+### `unsupported typecode timestamp` when timestamp with time zone is in object type attributes.
+
+(github issue #185)
+
 2.2.5.1
 =======
 

data/README.md

@@ -2,7 +2,7 @@ Ruby-oci8
 =========
 
 [![Gem Version](https://badge.fury.io/rb/ruby-oci8.svg)](http://badge.fury.io/rb/ruby-oci8)
-[![Circle CI](https://circleci.com/gh/kubo/ruby-oci8.png?style=shield)](https://circleci.com/gh/kubo/ruby-oci8)
+[![Build Status](https://travis-ci.org/kubo/ruby-oci8.svg?branch=master)](https://travis-ci.org/kubo/ruby-oci8)
 
 What is ruby-oci8
 -----------------

data/dist-files

@@ -109,4 +109,5 @@ test/test_oracle_version.rb
 test/test_oradate.rb
 test/test_oranumber.rb
 test/test_package_type.rb
+test/test_properties.rb
 test/test_rowid.rb

data/docs/install-on-osx.md

@@ -39,7 +39,7 @@ Download the following packages from [Oracle Technology Network][]
 
 * Instant Client Package - Basic (`instantclient-basic-macos.x64-12.1.0.2.0.zip`) or Basic Lite (`instantclient-basiclite-macos.x64-12.1.0.2.0.zip`)
 * Instant Client Package - SDK (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SQL*Plus (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`) (optionally) 
+* Instant Client Package - SQL*Plus (`instantclient-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
 
 ### Install Oracle Instant Client Packages via Homebrew
 

data/ext/oci8/apiwrap.rb

@@ -35,7 +35,11 @@ class FuncDef
     ver_major = (ver / 100)
     ver_minor = (ver / 10) % 10
     ver_update = ver % 10
-    @version = ((ver_major << 24) | (ver_minor << 20) | (ver_update << 12))
+    @version = if ver_major >= 18
+                 ((ver_major << 24) | (ver_minor << 16) | (ver_update << 12))
+               else
+                 ((ver_major << 24) | (ver_minor << 20) | (ver_update << 12))
+               end
     case @version
     when 0x08000000; @version_num = 'ORAVER_8_0'
     when 0x08100000; @version_num = 'ORAVER_8_1'
@@ -44,6 +48,7 @@ class FuncDef
     when 0x0a100000; @version_num = 'ORAVER_10_1'
     when 0x0a200000; @version_num = 'ORAVER_10_2'
     when 0x0b100000; @version_num = 'ORAVER_11_1'
+    when 0x12000000; @version_num = 'ORAVER_18'
     end
     @version_str = "#{ver_major}.#{ver_minor}.#{ver_update}"
     @ret = val[:ret] || 'sword'

data/ext/oci8/apiwrap.yml

@@ -1286,3 +1286,17 @@ OCIPing_nb:
             - OCISvcCtx *svchp
             - OCIError *errhp
             - ub4 mode
+
+#
+# Oracle 18.1
+#
+OCIServerRelease2:
+  :version: 1800
+  :args:
+            - dvoid *hndlp
+            - OCIError *errhp
+            - OraText *bufp
+            - ub4 bufsz
+            - ub1 hndltype
+            - ub4 *version
+            - ub4 mode

data/ext/oci8/hook_funcs.c

@@ -2,7 +2,7 @@
 /*
  * hook.c
  *
- * Copyright (C) 2015 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2015-2018 Kubo Takehiro <kubo@jiubao.org>
  */
 #if defined(_WIN32) || defined(__CYGWIN__)
 #define WINDOWS
@@ -12,15 +12,19 @@
 #include "plthook.h"
 #ifdef __CYGWIN__
 #undef boolean /* boolean defined in oratypes.h coflicts with that in windows.h */
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
 #endif
 #ifdef WINDOWS
 #include <windows.h>
 #include <mstcpip.h>
+#include <tlhelp32.h>
 #else
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#include <dlfcn.h>
 #endif
 
 #ifdef WINDOWS
@@ -59,6 +63,7 @@ static int WSAAPI hook_setsockopt(SOCKET sockfd, int level, int optname, const v
 int oci8_tcp_keepalive_time = -1;
 #endif
 
+static char hook_errmsg[512];
 
 typedef struct {
     const char *func_name;
@@ -95,35 +100,35 @@ static void socket_entry_clear(socket_entry_t *entry)
     UNLOCK(&lock);
 }
 
-static int replace_functions(const char * const *files, hook_func_entry_t *functions)
+static int replace_functions(void *addr, const char *file, hook_func_entry_t *functions)
 {
+    plthook_t *ph;
     int i;
+    int rv = 0;
 
-    for (i = 0; files[i] != NULL; i++) {
-        const char *file = files[i];
-        plthook_t *ph;
-        if (plthook_open(&ph, file) == 0) {
-            int j;
-            int rv = 0;
-
-            /* install hooks */
-            for (j = 0; functions[j].func_name != NULL ; j++) {
-                hook_func_entry_t *function = &functions[j];
-                rv = plthook_replace(ph, function->func_name, function->func_addr, &function->old_func_addr);
-                if (rv != 0) {
-                    while (--j >= 0) {
-                        /*restore hooked fuction address */
-                        plthook_replace(ph, functions[j].func_name, functions[j].old_func_addr, NULL);
-                    }
-                    plthook_close(ph);
-                    rb_raise(rb_eRuntimeError, "Could not replace function %s in %s", function->func_name, file);
-                }
+    if (plthook_open_by_address(&ph, addr) != 0) {
+        strncpy(hook_errmsg, plthook_error(), sizeof(hook_errmsg) - 1);
+        hook_errmsg[sizeof(hook_errmsg) - 1] = '\0';
+        return -1;
+    }
+
+    /* install hooks */
+    for (i = 0; functions[i].func_name != NULL ; i++) {
+        hook_func_entry_t *function = &functions[i];
+        rv = plthook_replace(ph, function->func_name, function->func_addr, &function->old_func_addr);
+        if (rv != 0) {
+            strncpy(hook_errmsg, plthook_error(), sizeof(hook_errmsg) - 1);
+            hook_errmsg[sizeof(hook_errmsg) - 1] = '\0';
+            while (--i >= 0) {
+                /*restore hooked fuction address */
+                plthook_replace(ph, functions[i].func_name, functions[i].old_func_addr, NULL);
             }
-            plthook_close(ph);
-            return 0;
+            snprintf(hook_errmsg, sizeof(hook_errmsg), "Could not replace function %s in %s", function->func_name, file);
+            break;
         }
     }
-    return -1;
+    plthook_close(ph);
+    return rv;
 }
 
 #ifdef WINDOWS
@@ -142,23 +147,6 @@ static int locK_is_initialized;
 
 static int WSAAPI hook_WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
 
-static const char * const tcp_func_files[] = {
-    /* full client */
-    "orantcp12.dll",
-    "orantcp11.dll",
-    "orantcp10.dll",
-    "orantcp9.dll",
-    /* instant client basic */
-    "oraociei12.dll",
-    "oraociei11.dll",
-    "oraociei10.dll",
-    /* instant client basic lite */
-    "oraociicus12.dll",
-    "oraociicus11.dll",
-    "oraociicus10.dll",
-    NULL,
-};
-
 static hook_func_entry_t tcp_functions[] = {
     {"WSARecv", (void*)hook_WSARecv, NULL},
     {"setsockopt", (void*)hook_setsockopt, NULL},
@@ -190,6 +178,9 @@ void oci8_install_hook_functions()
     DWORD data;
     DWORD cbData = sizeof(data);
     const char *reg_key = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters";
+    HANDLE hSnapshot;
+    MODULEENTRY32 me;
+    BOOL module_found = FALSE;
 
     if (hook_functions_installed) {
         return;
@@ -222,7 +213,32 @@ void oci8_install_hook_functions()
     }
     RegCloseKey(hKey);
 
-    if (replace_functions(tcp_func_files, tcp_functions) != 0) {
+    hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
+    me.dwSize = sizeof(me);
+    if (Module32First(hSnapshot, &me)) {
+        do {
+            const char *p = NULL;
+            if (strnicmp(me.szModule, "orantcp", 7) == 0) { // ORACLE_HOME-based client
+                p = me.szModule + 7;
+            } else if (strnicmp(me.szModule, "oraociei", 8) == 0) { // instant client basic
+                p = me.szModule + 8;
+            } else if (strnicmp(me.szModule, "oraociicus", 10) == 0) { // instant client basic lite
+                p = me.szModule + 10;
+            }
+            if (p != NULL && ('1' <= *p && *p <= '9') && ('0' <= *(p + 1) && *(p + 1) <= '9')
+                && stricmp(p + 2, ".dll") == 0) {
+                if (GetProcAddress((HMODULE)me.modBaseAddr, "nttini") != NULL) {
+                    module_found = TRUE;
+                    if (replace_functions(me.modBaseAddr, me.szExePath, tcp_functions) != 0) {
+                        CloseHandle(hSnapshot);
+                        rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
+                    }
+                }
+            }
+        } while (Module32Next(hSnapshot, &me));
+    }
+    CloseHandle(hSnapshot);
+    if (!module_found) {
         rb_raise(rb_eRuntimeError, "No DLL is found to hook.");
     }
     hook_functions_installed = 1;
@@ -241,20 +257,6 @@ static void shutdown_socket(socket_entry_t *entry)
 #else
 static ssize_t hook_read(int fd, void *buf, size_t count);
 
-#ifdef __APPLE__
-#define SO_EXT "dylib"
-#else
-#define SO_EXT "so"
-#endif
-
-static const char * const files[] = {
-    "libclntsh." SO_EXT ".12.1",
-    "libclntsh." SO_EXT ".11.1",
-    "libclntsh." SO_EXT ".10.1",
-    "libclntsh." SO_EXT ".9.0",
-    NULL,
-};
-
 static hook_func_entry_t functions[] = {
     {"read", (void*)hook_read, NULL},
 #ifdef SUPPORT_TCP_KEEPALIVE_TIME
@@ -279,16 +281,44 @@ static ssize_t hook_read(int fd, void *buf, size_t count)
     return rv;
 }
 
+static void *ocifunc_addr(void *dlsym_handle, const char **file)
+{
+    void *addr = dlsym(dlsym_handle, "OCIEnvCreate");
+    Dl_info dli;
+
+    if (addr == NULL) {
+        return NULL;
+    }
+    if (dladdr(addr, &dli) == 0) {
+        return NULL;
+    }
+    if (strstr(dli.dli_fname, "/libclntsh.so") == 0) {
+        return NULL;
+    }
+    *file = dli.dli_fname;
+    return addr;
+}
+
 void oci8_install_hook_functions(void)
 {
     static int hook_functions_installed = 0;
+    void *addr;
+    const char *file;
 
     if (hook_functions_installed) {
         return;
     }
-    if (replace_functions(files, functions) != 0) {
+    addr = ocifunc_addr(RTLD_DEFAULT, &file);
+    if (addr == NULL) {
+        /* OCI symbols may be hooked by LD_PRELOAD. */
+        addr = ocifunc_addr(RTLD_NEXT, &file);
+    }
+    if (addr == NULL) {
         rb_raise(rb_eRuntimeError, "No shared library is found to hook.");
     }
+    if (replace_functions(addr, file, functions) != 0) {
+        rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
+    }
     hook_functions_installed = 1;
 }
 

data/ext/oci8/lob.c

@@ -26,8 +26,6 @@ static VALUE seek_end;
 
 enum state {
     S_NO_OPEN_CLOSE,
-    S_OPEN,
-    S_CLOSE,
     S_BFILE_CLOSE,
     S_BFILE_OPEN,
 };
@@ -266,28 +264,6 @@ static ub8 oci8_lob_get_length(oci8_lob_t *lob)
     return len;
 }
 
-static void lob_open(oci8_lob_t *lob)
-{
-    if (lob->state == S_CLOSE) {
-        oci8_svcctx_t *svcctx = check_svcctx(lob);
-
-        chker2(OCILobOpen_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, OCI_DEFAULT),
-               &svcctx->base);
-        lob->state = S_OPEN;
-    }
-}
-
-static void lob_close(oci8_lob_t *lob)
-{
-    if (lob->state == S_OPEN) {
-        oci8_svcctx_t *svcctx = check_svcctx(lob);
-
-        chker2(OCILobClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob),
-               &svcctx->base);
-        lob->state = S_CLOSE;
-    }
-}
-
 static void bfile_close(oci8_lob_t *lob)
 {
     if (lob->state == S_BFILE_OPEN) {
@@ -368,7 +344,6 @@ static void bfile_close(oci8_lob_t *lob)
 static VALUE oci8_lob_close(VALUE self)
 {
     oci8_lob_t *lob = TO_LOB(self);
-    lob_close(lob);
     oci8_base_free(&lob->base);
     return self;
 }
@@ -591,7 +566,6 @@ static VALUE oci8_lob_truncate(VALUE self, VALUE len)
     oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
 
-    lob_open(lob);
     chker2(OCILobTrim2_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2ULL(len)),
            &svcctx->base);
     return self;
@@ -740,7 +714,6 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
     } while (rv == OCI_NEED_DATA);
 
     if (pos >= lob_length) {
-        lob_close(lob);
         bfile_close(lob);
     }
     lob->pos = pos;
@@ -781,7 +754,6 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
     ub8 byte_amt;
     ub8 char_amt;
 
-    lob_open(lob);
     if (TYPE(data) != T_STRING) {
         str = rb_obj_as_string(data);
     } else {
@@ -809,40 +781,32 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
 }
 
 /*
- *  @deprecated I'm not sure that this is what the name indicates.
+ *  @deprecated LOB#sync had not worked by mistake. Do nothing now.
  *  @private
  */
 static VALUE oci8_lob_get_sync(VALUE self)
 {
-    oci8_lob_t *lob = TO_LOB(self);
-    return (lob->state == S_NO_OPEN_CLOSE) ? Qtrue : Qfalse;
+    rb_warning("LOB#sync had not worked by mistake. Do nothing now.");
+    return Qfalse;
 }
 
 /*
- *  @deprecated I'm not sure that this is what the name indicates.
+ *  @deprecated LOB#sync had not worked by mistake. Do nothing now.
  *  @private
  */
 static VALUE oci8_lob_set_sync(VALUE self, VALUE b)
 {
-    oci8_lob_t *lob = TO_LOB(self);
-    if (RTEST(b)) {
-        lob_close(lob);
-        lob->state = S_NO_OPEN_CLOSE;
-    } else {
-        if (lob->state == S_NO_OPEN_CLOSE)
-            lob->state = S_CLOSE;
-    }
+    rb_warning("LOB#sync had not worked by mistake. Do nothing now.");
     return b;
 }
 
 /*
- *  @deprecated I'm not sure that this is what the name indicates.
+ *  @deprecated LOB#flush had not worked by mistake. Do nothing now.
  *  @private
  */
 static VALUE oci8_lob_flush(VALUE self)
 {
-    oci8_lob_t *lob = TO_LOB(self);
-    lob_close(lob);
+    rb_warning("LOB#flush had not worked by mistake. Do nothing now.");
     return self;
 }
 

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;
@@ -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) {
@@ -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;
@@ -818,6 +844,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

@@ -582,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().");
@@ -604,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;
 }
 
@@ -796,11 +808,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);
 }
 
 /*

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;
@@ -489,8 +506,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);
 

data/ext/oci8/oci8lib.c

@@ -620,11 +620,13 @@ void *oci8_find_symbol(const char *symbol_name)
             "libclntsh.sl.10.1",
 #elif defined(__APPLE__)
             /* Mac OS X */
+            "libclntsh.dylib",
             "libclntsh.dylib.12.1",
             "libclntsh.dylib.11.1",
             "libclntsh.dylib.10.1",
 #else
             /* Linux, Solaris and HP-UX(IA64) */
+            "libclntsh.so",
             "libclntsh.so.12.1",
             "libclntsh.so.11.1",
             "libclntsh.so.10.1",

data/ext/oci8/win32.c

@@ -21,26 +21,6 @@
  *  @private
  */
 
-NORETURN(static void raise_error(void));
-
-static void raise_error(void)
-{
-    char msg[1024];
-    int err = GetLastError();
-    char *p;
-
-    sprintf(msg, "%d: ", err);
-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                  NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                  msg + strlen(msg), sizeof(msg) - strlen(msg), NULL);
-    for (p = msg; *p != '\0'; p++) {
-        if (*p == '\n' || *p == '\r') {
-            *p = ' ';
-        }
-    }
-    rb_raise(rb_eRuntimeError, "%s", msg);
-}
-
 typedef struct {
     HKEY hKey;
     HKEY hSubKey;

data/lib/oci8.rb

@@ -140,6 +140,8 @@ class OCI8
   ORAVER_11_1 = OCI8::OracleVersion.new(11, 1)
   # @private
   ORAVER_12_1 = OCI8::OracleVersion.new(12, 1)
+  # @private
+  ORAVER_18 = OCI8::OracleVersion.new(18)
 
   # @private
   @@oracle_client_version = OCI8::OracleVersion.new(self.oracle_client_vernum)

data/lib/oci8/metadata.rb

@@ -1503,7 +1503,11 @@ class OCI8
         attr_get_sb1(OCI_ATTR_SCALE)
       end
 
-      # The datatype levels. This attribute always returns zero.
+      # The nest level.
+      #
+      # Oracle manual says that it always returns zero. However it returns
+      # the depth of {OCI8::ArgBase#arguments} calls when #arguments returns
+      # a non-empty array.
       def level
         attr_get_ub2(OCI_ATTR_LEVEL)
       end
@@ -1607,6 +1611,10 @@ class OCI8
 
       # The list of arguments at the next level (when the argument is
       # of a record or table type).
+      #
+      # This method returns an array containing type information when
+      # the type is a user-defined type and the Oracle server version
+      # is 12c or earlier. Otherwise, it returns an empty array.
       def arguments
         @arguments ||= list_arguments.to_a
       end

data/lib/oci8/object.rb

@@ -493,6 +493,16 @@ EOS
          Proc.new do |val| datetime_to_array(val, :date) end, # set_proc
          Proc.new do |val| array_to_time(val, :local) end, # get_proc
         ]
+      when :timestamp
+        [ATTR_TIMESTAMP, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp) end, # set_proc
+         Proc.new do |val| array_to_time(val, :local) end, # get_proc
+        ]
+      when :timestamp_tz
+        [ATTR_TIMESTAMP_TZ, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp_tz) end, # set_proc
+         Proc.new do |val| array_to_time(val, nil) end, # get_proc
+        ]
       when :binary_double
         [ATTR_BINARY_DOUBLE, nil, SIZE_OF_DOUBLE, 2, ALIGNMENT_OF_DOUBLE]
       when :binary_float

data/lib/oci8/oci8.rb

@@ -340,6 +340,12 @@ class OCI8
 
   # Returns the Oracle server version.
   #
+  # When the Oracle client version is 12c or earlier and
+  # the Oracle server version is 18c or later, this method
+  # doesn't return *full* version number such as '18.3.0.0.0'.
+  # It returns version number whose number components after
+  # the first dot are zeros such as '18.0.0.0.0'.
+  #
   # @see OCI8.oracle_client_version
   # @return [OCI8::OracleVersion]
   def oracle_server_version

data/lib/oci8/oracle_version.rb

@@ -66,6 +66,12 @@ class OCI8
         major, minor, update, patch, port_update = arg.split('.').collect do |v|
           v.to_i
         end
+      elsif arg >= 0x12000000
+        major  = (arg & 0xFF000000) >> 24
+        minor  = (arg & 0x00FF0000) >> 16
+        update = (arg & 0x0000F000) >> 12
+        patch  = (arg & 0x00000FF0) >>  4
+        port_update = (arg & 0x0000000F)
       elsif arg >= 0x08000000
         major  = (arg & 0xFF000000) >> 24
         minor  = (arg & 0x00F00000) >> 20
@@ -80,7 +86,11 @@ class OCI8
       @update = update || 0
       @patch = patch || 0
       @port_update = port_update || 0
-      @vernum = (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+      @vernum = if @major >= 18
+                  (@major << 24) | (@minor << 16) | (@update << 12) | (@patch << 4) | @port_update
+                else
+                  (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+                end
     end
 
     # Compares +self+ and +other+.

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.5.1"
+  VERSION = "2.2.6"
 end

data/lib/ruby-oci8.rb

@@ -1,4 +1 @@
-if caller[0] !~ /\/bundler\/runtime\.rb:\d+:in `require'/
-  warn "Don't require 'ruby-oci8'. Use \"require 'oci8'\" instead. 'ruby-oci8.rb' was added only for 'Bundler.require'."
-end
 require 'oci8'

data/test/setup_test_object.sql

@@ -61,6 +61,8 @@ create type rb_test_obj as object (
   obj_array_val rb_test_obj_elem_array,
   obj_ary_of_ary_val rb_test_obj_elem_ary_of_ary,
   date_val date,
+  timestamp_val timestamp(9),
+  timestamp_tz_val timestamp(9) with time zone,
 --  date_array_val rb_test_date_array,
 
   constructor function rb_test_obj(n number) return self as result,
@@ -72,19 +74,23 @@ create type rb_test_obj as object (
   member procedure member_proc(n in integer)
 )
 /
-create or replace type body rb_test_obj is
-
+create type body rb_test_obj is
   constructor function rb_test_obj(n number) return self as result is
-    function to_test_date(n number) return date is
-    begin
-      return to_date(to_char(1990 + n, 'FM0000') ||
-                     to_char(mod(round(n) * 5, 12) + 1, 'FM00') ||
-                     to_char(mod(round(n) * 7, 27) + 1, 'FM00') ||
-                     to_char(mod(round(n) * 9, 24), 'FM00') ||
-                     to_char(mod(round(n) * 11, 60), 'FM00') ||
-                     to_char(mod(round(n) * 13, 60), 'FM00'), 'yyyymmddhh24miss');
-    end;
+    str varchar(28);
+    ts timestamp(9);
+    ts_tz timestamp(9) with time zone;
   begin
+    str := to_char(1990 + n, 'FM0000') ||
+                   to_char(mod(round(n) * 5, 12) + 1, 'FM00') ||
+                   to_char(mod(round(n) * 7, 27) + 1, 'FM00') ||
+                   to_char(mod(round(n) * 9, 24), 'FM00') ||
+                   to_char(mod(round(n) * 11, 60), 'FM00') ||
+                   to_char(mod(round(n) * 13, 60), 'FM00') ||
+                   to_char(mod(round(n) * 333333333, 1000000000), 'FM000000000');
+    ts := to_timestamp(str, 'yyyymmddhh24missff9');
+    str := str || to_char(mod(round(n) * 15, 24) - 11, 'FMS00') ||
+                  to_char(mod(round(n) * 17, 60), 'FM00');
+    ts_tz := to_timestamp_tz(str, 'yyyymmddhh24missff9tzhtzm');
     self.int_val := n;
     self.flt_val := n;
     self.num_val := n;
@@ -96,7 +102,9 @@ create or replace type body rb_test_obj is
     self.nclob_val := to_clob(n);
     self.blob_val := to_blob(utl_raw.cast_to_raw(to_char(n)));
     self.obj_val := rb_test_obj_elem(n, n + 1);
-    self.date_val := to_test_date(n);
+    self.date_val := ts;
+    self.timestamp_val := ts;
+    self.timestamp_tz_val := ts_tz;
     if self.int_val != 1 then
       self.int_array_val := rb_test_int_array(n, n + 1, n + 2);
       self.flt_array_val := rb_test_flt_array(n, n + 1, n + 2);
@@ -120,7 +128,7 @@ create or replace type body rb_test_obj is
 
   static function test_object_version return integer is
   begin
-    return 3;
+    return 4;
   end;
 
   static function class_func(n number) return rb_test_obj is

data/test/test_all.rb

@@ -26,6 +26,7 @@ require "#{srcdir}/test_oracle_version"
 require "#{srcdir}/test_error"
 require "#{srcdir}/test_connection_pool"
 require "#{srcdir}/test_object"
+require "#{srcdir}/test_properties.rb"
 
 if OCI8.respond_to? :encoding
   require "#{srcdir}/test_encoding"

data/test/test_clob.rb

@@ -24,22 +24,6 @@ class TestCLob < Minitest::Test
     lob.close
   end
 
-  def test_insert_with_flush
-    filename = File.basename($lobfile)
-    @conn.exec("DELETE FROM test_table WHERE filename = :1", filename)
-    @conn.exec("INSERT INTO test_table(filename, content) VALUES (:1, EMPTY_CLOB())", filename)
-    cursor = @conn.exec("SELECT content FROM test_table WHERE filename = :1 FOR UPDATE", filename)
-    lob = cursor.fetch[0]
-    lob.sync = false
-    open($lobfile) do |f|
-      while s = f.read(1000)
-        lob.write(s)
-      end
-    end
-    lob.flush
-    lob.close
-  end
-
   def test_insert_symbol
     filename = 'test_symbol'
     value = :foo_bar
@@ -76,6 +60,9 @@ class TestCLob < Minitest::Test
 
   # https://github.com/kubo/ruby-oci8/issues/20
   def test_github_issue_20
+    # Skip this test if FULLTEST isn't set because it takes 4 minutes in my Linux box.
+    return if ENV['FULLTEST']
+
     lob1 = OCI8::CLOB.new(@conn, ' '  * (1024 * 1024))
     lob1.read(1) # to suppress `warning: assigned but unused variable - lob1`
     begin

data/test/test_object.rb

@@ -1,6 +1,12 @@
 require 'oci8'
 require File.dirname(__FILE__) + '/config'
 
+class Time
+  def inspect
+    self.strftime("%Y-%m-%d %H:%M:%S.%N %:z")
+  end
+end
+
 conn = OCI8.new($dbuser, $dbpass, $dbname)
 error_message = nil
 begin
@@ -22,7 +28,7 @@ begin
 
   begin
     version = RbTestObj.test_object_version(conn)
-    error_message = "Invalid test object version" if version != 3
+    error_message = "Invalid test object version" if version != 4
   rescue NoMethodError
     raise unless $!.to_s.include?('test_object_version')
     error_message = "rb_test_obj.test_object_version is not declared."
@@ -100,7 +106,8 @@ class TestObj1 < Minitest::Test
     attr_reader :obj_array_val
     attr_reader :obj_ary_of_ary_val
     attr_reader :date_val
-#    attr_reader :date_array_val
+    attr_reader :timestamp_val
+    attr_reader :timestamp_tz_val
 
     attr_accessor :assertions
 
@@ -109,16 +116,28 @@ class TestObj1 < Minitest::Test
       @assertions = 0
     end
 
-    def to_test_date(n)
+    def to_test_datetime(n, type)
       year = (1990 + n).round
       month = (n.round * 5) % 12 + 1
       mday = (n.round * 7) % 27 + 1
       hour = (n.round * 9) % 24
       minute = (n.round * 11) % 60
       sec = (n.round * 13) % 60
-      convert_to_time(year, month, mday, hour, minute, sec, 0, nil)
+      nsec = if type == :date
+               0
+             else
+               ((n.round * 333_333_333) % 1_000_000_000).to_r / 1_000_000_000
+             end
+      tz = if type == :timestamp_tz
+             tzh = (n.round * 15) % 24 - 11
+             tzm = (n.round * 17) % 60
+             format('%+03d:%02d', tzh, tzm)
+           else
+             nil
+           end
+      convert_to_time(year, month, mday, hour, minute, sec, nsec, tz)
     end
-    private :to_test_date
+    private :to_test_datetime
 
     def next
       @n += 1.2
@@ -135,7 +154,9 @@ class TestObj1 < Minitest::Test
       @nclob_val = @str_val
       @blob_val = @str_val
       @obj_val = ExpectedValObjElem.new(@int_val, @int_val + 1)
-      @date_val = to_test_date(@n)
+      @date_val = to_test_datetime(@n, :date)
+      @timestamp_val = to_test_datetime(@n, :timestamp)
+      @timestamp_tz_val = to_test_datetime(@n, :timestamp_tz)
       if @int_val == 1
         @int_array_val = nil
         @flt_array_val = nil
@@ -199,7 +220,8 @@ class TestObj1 < Minitest::Test
         obj_array_val = val[18]
         obj_ary_of_ary_val = val[19]
         date_val = val[20]
-#        date_array_val = val[18]
+        timestamp_val = val[21]
+        timestamp_tz_val = val[22]
       else
         assert_instance_of(RbTestObj, val)
         int_val = val.int_val
@@ -223,7 +245,8 @@ class TestObj1 < Minitest::Test
         obj_array_val = val.obj_array_val
         obj_ary_of_ary_val = val.obj_ary_of_ary_val
         date_val = val.date_val
-#        date_array_val = val.date_array_val
+        timestamp_val = val.timestamp_val
+        timestamp_tz_val = val.timestamp_tz_val
       end
 
       assert_equal(@int_val, int_val)
@@ -267,7 +290,8 @@ class TestObj1 < Minitest::Test
         assert_nil(obj_ary_of_ary_val)
       end
       assert_equal(@date_val, date_val)
-#      assert_equal(@date_array_val, date_array_val && date_array_val.to_ary)
+      assert_equal(@timestamp_val, timestamp_val)
+      assert_equal(@timestamp_tz_val, timestamp_tz_val)
     end
 
     def assert_array_in_delta(exp, val)

data/test/test_oci8.rb

@@ -491,9 +491,23 @@ EOS
                        else
                          raise "Unknown column size #{column_size}"
                        end
-      driver_name = cursor.fetch[0]
+      driver_name = cursor.fetch[0].strip
       cursor.close
       assert_equal(expected_value, driver_name)
     end
   end
+
+  def test_server_version
+    cursor = @conn.exec("select * from product_component_version where product like 'Oracle Database %'")
+    row = cursor.fetch_hash
+    cursor.close
+    ver = if OCI8::oracle_client_version >= OCI8::ORAVER_18
+            row['VERSION_FULL'] || row['VERSION']
+          else
+            # OCI8#oracle_server_version could not get infomation corresponding
+            # to VERSION_FULL when the Oracle client version is below 18.1.
+            row['VERSION']
+          end
+    assert_equal(ver, @conn.oracle_server_version.to_s)
+  end
 end # TestOCI8

data/test/test_package_type.rb

@@ -639,7 +639,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_PLS_INTEGER",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {
@@ -729,7 +733,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_REC1",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {
@@ -846,7 +854,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_REC1",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {

data/test/test_properties.rb

@@ -0,0 +1,17 @@
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestProperties < Minitest::Test
+  def test_tcp_keepalive_time
+    begin
+      oldval = OCI8.properties[:tcp_keepalive_time]
+      begin
+        OCI8.properties[:tcp_keepalive_time] = 600
+        assert(true)
+      ensure
+        OCI8.properties[:tcp_keepalive_time] = oldval
+      end
+    rescue NotImplementedError
+    end
+  end
+end

metadata

@@ -1,35 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-oci8
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 5
-  - 1
-  version: 2.2.5.1
+version: !ruby/object:Gem::Version
+  version: 2.2.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2017-12-27 00:00:00 +09:00
-default_executable: 
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies: []
+description: ! 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
+  with Oracle 10g or later including Oracle Instant Client.
 
-description: |
-  ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle 10g or later including Oracle Instant Client.
-
+'
 email: kubo@jiubao.org
 executables: []
-
-extensions: 
+extensions:
 - ext/oci8/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .yardopts
 - COPYING
 - COPYING_old
@@ -141,41 +133,34 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_package_type.rb
+- test/test_properties.rb
 - test/test_rowid.rb
-has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
-licenses: 
+licenses:
 - BSD-2-Clause
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext/oci8
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API
-test_files: 
+test_files:
 - test/test_all.rb
+has_rdoc: yard