ruby-oci8 2.2.12 → 2.2.14

data/ext/oci8/plthook_win32.c

@@ -1,6 +1,6 @@
 /* -*- indent-tabs-mode: nil -*-
  *
- * plthook_win32.c -- implemention of plthook for PE format
+ * plthook_win32.c -- implementation of plthook for PE format
  *
  * URL: https://github.com/kubo/plthook
  *
@@ -86,7 +86,7 @@ int plthook_open(plthook_t **plthook_out, const char *filename)
     HMODULE hMod;
 
     *plthook_out = NULL;
-    if (!GetModuleHandleExA(0, filename, &hMod)) {
+    if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, filename, &hMod)) {
         set_errmsg2("Cannot get module %s: ", filename);
         return PLTHOOK_FILE_NOT_FOUND;
     }
@@ -107,7 +107,7 @@ int plthook_open_by_address(plthook_t **plthook_out, void *address)
     HMODULE hMod;
 
     *plthook_out = NULL;
-    if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &hMod)) {
+    if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, address, &hMod)) {
         set_errmsg2("Cannot get module at address %p: ", address);
         return PLTHOOK_FILE_NOT_FOUND;
     }
@@ -134,7 +134,8 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
     for (desc = desc_head; desc->Name != 0; desc++) {
         IMAGE_THUNK_DATA *name_thunk = (IMAGE_THUNK_DATA*)((char*)hMod + desc->OriginalFirstThunk);
         IMAGE_THUNK_DATA *addr_thunk = (IMAGE_THUNK_DATA*)((char*)hMod + desc->FirstThunk);
-        int is_winsock2_dll = (stricmp((char *)hMod + desc->Name, "WS2_32.DLL") == 0);
+        const char *module_name = (char *)hMod + desc->Name;
+        int is_winsock2_dll = (stricmp(module_name, "WS2_32.DLL") == 0);
 
         while (addr_thunk->u1.Function != 0) {
             if (IMAGE_SNAP_BY_ORDINAL(name_thunk->u1.Ordinal)) {
@@ -144,8 +145,11 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
                     name = winsock2_ordinal2name(ordinal);
                 }
                 if (name == NULL) {
-                    char buf[64];
-                    ordinal_name_buflen += sprintf(buf, "#%d", ordinal) + 1;
+#ifdef __CYGWIN__
+                    ordinal_name_buflen += snprintf(NULL, 0, "%s:@%d", module_name, ordinal) + 1;
+#else
+                    ordinal_name_buflen += _scprintf("%s:@%d", module_name, ordinal) + 1;
+#endif
                 }
             }
             num_entries++;
@@ -167,7 +171,8 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
     for (desc = desc_head; desc->Name != 0; desc++) {
         IMAGE_THUNK_DATA *name_thunk = (IMAGE_THUNK_DATA*)((char*)hMod + desc->OriginalFirstThunk);
         IMAGE_THUNK_DATA *addr_thunk = (IMAGE_THUNK_DATA*)((char*)hMod + desc->FirstThunk);
-        int is_winsock2_dll = (stricmp((char *)hMod + desc->Name, "WS2_32.DLL") == 0);
+        const char *module_name = (char *)hMod + desc->Name;
+        int is_winsock2_dll = (stricmp(module_name, "WS2_32.DLL") == 0);
 
         while (addr_thunk->u1.Function != 0) {
             const char *name = NULL;
@@ -178,12 +183,13 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
                     name = winsock2_ordinal2name(ordinal);
                 }
                 if (name == NULL) {
-                    ordinal_name_buf += sprintf(ordinal_name_buf, "#%d", ordinal) + 1;
+                    name = ordinal_name_buf;
+                    ordinal_name_buf += sprintf(ordinal_name_buf, "%s:@%d", module_name, ordinal) + 1;
                 }
             } else {
                 name = (char*)((PIMAGE_IMPORT_BY_NAME)((char*)hMod + name_thunk->u1.AddressOfData))->Name;
             }
-            plthook->entries[idx].mod_name = (char *)hMod + desc->Name;
+            plthook->entries[idx].mod_name = module_name;
             plthook->entries[idx].name = name;
             plthook->entries[idx].addr = (void**)&addr_thunk->u1.Function;
             idx++;
@@ -231,41 +237,49 @@ int plthook_replace(plthook_t *plthook, const char *funcname, void *funcaddr, vo
     const char *name;
     void **addr;
     int rv;
+    BOOL import_by_ordinal = funcname[0] != '?' && strstr(funcname, ":@") != NULL;
 
     if (plthook == NULL) {
         set_errmsg("invalid argument: The first argument is null.");
         return PLTHOOK_INVALID_ARGUMENT;
     }
     while ((rv = plthook_enum(plthook, &pos, &name, &addr)) == 0) {
+        if (import_by_ordinal) {
+            if (stricmp(name, funcname) == 0) {
+                goto found;
+            }
+        } else {
+            /* import by name */
 #ifdef _WIN64
-        if (strcmp(name, funcname) == 0) {
-            replace_funcaddr(addr, funcaddr, oldfunc);
-            return 0;
-        }
-#else
-        /* Function names may be decorated in Windows 32-bit applications. */
-        if (strncmp(name, funcname, funcnamelen) == 0) {
-            if (name[funcnamelen] == '\0' || name[funcnamelen] == '@') {
-                replace_funcaddr(addr, funcaddr, oldfunc);
-                return 0;
+            if (strcmp(name, funcname) == 0) {
+                goto found;
             }
-        }
-        if (name[0] == '_' || name[0] == '@') {
-            name++;
+#else
+            /* Function names may be decorated in Windows 32-bit applications. */
             if (strncmp(name, funcname, funcnamelen) == 0) {
                 if (name[funcnamelen] == '\0' || name[funcnamelen] == '@') {
-                    replace_funcaddr(addr, funcaddr, oldfunc);
-                    return 0;
+                    goto found;
+                }
+            }
+            if (name[0] == '_' || name[0] == '@') {
+                name++;
+                if (strncmp(name, funcname, funcnamelen) == 0) {
+                    if (name[funcnamelen] == '\0' || name[funcnamelen] == '@') {
+                        goto found;
+                    }
                 }
             }
-        }
 #endif
+        }
     }
     if (rv == EOF) {
         set_errmsg("no such function: %s", funcname);
         rv = PLTHOOK_FUNCTION_NOT_FOUND;
     }
     return rv;
+found:
+    replace_funcaddr(addr, funcaddr, oldfunc);
+    return 0;
 }
 
 void plthook_close(plthook_t *plthook)

data/lib/oci8/oracle_version.rb

@@ -127,7 +127,15 @@ class OCI8
     #
     # @return [String]
     def to_s
-      format('%d.%d.%d.%d.%d', @major, @minor, @update, @patch, @port_update)
+      version_format =
+        if @major >= 23 && @patch != 0 && @port_update != 0
+          # The fifth numeral is the release month (01 through 12) since Oracle 23ai
+          # See https://docs.oracle.com/en/database/oracle/oracle-database/23/upgrd/oracle-database-release-numbers.html#GUID-1E2F3945-C0EE-4EB2-A933-8D1862D8ECE2__GUID-704EC7BB-4EEA-4A92-96FC-579B216DCA97
+          '%d.%d.%d.%d.%02d'
+        else
+          '%d.%d.%d.%d.%d'
+        end
+      format(version_format, @major, @minor, @update, @patch, @port_update)
     end
 
     # Returns true if +self+ and +other+ are the same type and have

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.12"
+  VERSION = "2.2.14"
 end

data/lib/oci8.rb

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

data/test/test_metadata.rb

@@ -1896,6 +1896,7 @@ EOS
     # Get data_size of NCHAR(1) and that of CHAR(1 CHAR).
     # They depend on the database character set and the
     # client character set.
+    drop_table('test_table')
     @conn.exec('CREATE TABLE test_table (nc NCHAR(1), c CHAR(1 CHAR))')
     cursor = @conn.exec("select * from test_table")
     cfrm = cursor.column_metadata[0].data_size # size of NCHAR(1) in bytes

data/test/test_oranumber.rb

@@ -697,7 +697,9 @@ EOS
         OraNumber.new(str)
         flunk("exception expected but none was thrown. test data: " + str)
       rescue
-        assert_equal(oraerr.to_s, $!.to_s, "test data: " + str)
+        expected_errhead = oraerr.to_s.gsub(/:.*/m, '') # strip chars after ':'
+        actual_errhead = $!.to_s.gsub(/:.*/m, '')
+        assert_equal(expected_errhead, actual_errhead, "test data: " + str)
       end
     end
     if onum

data/test/test_package_type.rb

@@ -47,6 +47,12 @@ class TestPackageType < Minitest::Test
   end
 
   def test_describe_package
+    if $oracle_server_version >= OCI8::ORAVER_23
+      boolean_type_name = 'BOOLEAN'
+    else
+      boolean_type_name = 'PL/SQL BOOLEAN'
+    end
+
     integer_type_attrs = {
       :class => OCI8::Metadata::Type,
       #:typecode => nil,
@@ -127,7 +133,7 @@ class TestPackageType < Minitest::Test
       #:map_method => nil,
       #:order_method => nil,
       :is_invoker_rights? => false,
-      :name => 'PL/SQL BOOLEAN',
+      :name => boolean_type_name,
       :schema_name => 'SYS',
       :is_final_type? => true,
       :is_instantiable_type? => true,
@@ -137,7 +143,7 @@ class TestPackageType < Minitest::Test
       :package_name => nil,
       :type_attrs => [],
       #:type_methods => [],
-      :inspect => '#<OCI8::Metadata::Type:(0) SYS.PL/SQL BOOLEAN>', # TODO: change to "BOOLEAN"
+      :inspect => "#<OCI8::Metadata::Type:(0) SYS.#{boolean_type_name}>",
     }
 
     varchar2_type_attrs = {
@@ -277,7 +283,7 @@ class TestPackageType < Minitest::Test
         :num_elems => 0,
         :precision => 0,
         :scale => 0,
-        :type_name => 'PL/SQL BOOLEAN',
+        :type_name => boolean_type_name,
         :schema_name => 'SYS',
         :type_metadata => boolean_type_attrs,
         :inspect => '#<OCI8::Metadata::Collection: BOOLEAN>',
@@ -444,7 +450,7 @@ class TestPackageType < Minitest::Test
           :name => 'B',
           :precision => 0,
           :scale => 0,
-          :type_name => 'PL/SQL BOOLEAN',
+          :type_name => boolean_type_name,
           :schema_name => 'SYS',
           :fsprecision => 0,
           :lfprecision => 0,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.14
 platform: ruby
 authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2024-08-06 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.
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: Ruby interface for Oracle using OCI8 API