ruby-oci8 2.2.6.1-x64-mingw32 → 2.2.10-x64-mingw32

data/docs/install-on-osx.md

@@ -1,133 +1,46 @@
-# @title Install ruby-oci8 on OS X
+# @title Install ruby-oci8 on macOS
 
-Install ruby-oci8 on OS X
+Install ruby-oci8 on macOS
 =========================
 
-This page explains the way to install ruby-oci8 os OS X.
+**Note: Ruby-oci8 doesn't run on Apple Silicon because Oracle instant client
+for Apple Silicon has not been released yet.**
 
-Look at {file:docs/install-full-client.md}, {file:docs/install-instant-client.md}
-or {file:docs/install-binary-package.md} for other platforms.
-
-Install C compiler
-------------------
-
-You need to install the command line developer tools or the Xcode.
-(The latter includes the former.)
-
-Run `"cc --version"` in a terminal to check whether they are installed.
-
-If the cc version is printed, the tools are installed.
-
-If the follwoing dialog is displayed, click its Install button to
-install the tools.
-You have no need to install the Xcode to compile ruby-oci8.
-It requires command line tools, not an IDE such as the Xcode.
-
-![dialog](osx-install-dev-tools.png)
+Prerequisite
+------------
 
-If `"Agreeing to the Xcode/iOS license requires admin privileges,
-please re-run as root via sudo."` is printed, you need to run
-`"sudo cc --version"`, enter your password, look at the license
-and type `"agree"`.
+* Command line tools for Xcode or Xcode (by executing `xcode-select --install`) or [Xcode]
 
 Install Oracle Instant Client Packages
 --------------------------------------
 
-### Download Oracle Instant Client Packages
-
-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-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
-
-### Install Oracle Instant Client Packages via Homebrew
-
-To install `Oracle Instant Client Basic` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basic
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus # (optionally)
-
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-To install `Oracle Instant Client Basic Lite` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basiclite
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus --with-basiclite # (optionally)
-        
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-### Install Oracle Instant Client Manually
-
-If you don't use [Homebrew][], do the following:
-
-Unzip the packages as follows:
-
-    mkdir -p /opt/oracle
-    cd /opt/oracle
-
-Copy downloaded files to /opt/oracle before running the following commands.
-
-    unzip instantclient-basic-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sdk-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sqlplus-macos.x64-12.1.0.2.0.zip
-
-Make a symbolic link to link the library.
-
-    cd /opt/oracle/instantclient_12_1
-    ln -s libclntsh.dylib.12.1 libclntsh.dylib
-
-Set the environment variable OCI_DIR while performing the following installation steps.
-
-    export OCI_DIR=/opt/oracle/instantclient_12_1
-
-Installation
-------------
-
-If you get a problem in the following steps, look at {file:docs/report-installation-issue.md}.
-
-### gem package
-
-Run the following command.
+If you have installed [Homebrew], use the following command:
 
-    gem install ruby-oci8
+```shell
+$ brew tap InstantClientTap/instantclient
+$ brew install instantclient-basic   # or instantclient-basiclite
+$ brew install instantclient-sdk
+$ brew install instantclient-sqlplus # (optionally)
+```
 
-### tar.gz package
+Otherwise, look at this [page][OTN] and set the environment variable
+`OCI_DIR` to point the the directory where instant client is installed.
+Ruby-oci8 installation script checks the directory.
 
-#### Download the source code
+```shell
+export OCI_DIR=$HOME/Downloads/instantclient_19_8  # for example
+```
 
-Download the latest tar.gz package from [download page][].
+Install ruby-oci8
+-----------------
 
-#### Run make and install
+Note that `/usr/bin/ruby` isn't available. You need to use [`rbenv`] or so.
 
-    tar xvfz ruby-oci8-VERSION.tar.gz
-    cd ruby-oci8-VERSION
-    make
-    make install
+```shell
+$ gem install ruby-oci8
+```
 
-[download page]: https://bintray.com/kubo/generic/ruby-oci8
 [Homebrew]: http://brew.sh/
-[fix_oralib]: https://github.com/kubo/fix_oralib_osx
-[Oracle Technology Network]: http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html
+[OTN]: https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html#ic_osx_inst
+[Xcode]: https://apps.apple.com/us/app/xcode/id497799835
+[`rbenv`]: https://github.com/rbenv/rbenv

data/lib/oci8/bindtype.rb

@@ -172,20 +172,6 @@ class OCI8
       end
     end
 
-    class Long < OCI8::BindType::String
-      def self.create(con, val, param, max_array_size)
-        param = {:length => con.long_read_len, :char_semantics => true}
-        super(con, val, param, max_array_size)
-      end
-    end
-
-    class LongRaw < OCI8::BindType::RAW
-      def self.create(con, val, param, max_array_size)
-        param = {:length => con.long_read_len, :char_semantics => false}
-        self.new(con, val, param, max_array_size)
-      end
-    end
-
     class CLOB
       def self.create(con, val, param, max_array_size)
         if param.is_a? OCI8::Metadata::Base and param.charset_form == :nchar

data/lib/oci8/check_load_error.rb

@@ -6,14 +6,24 @@ class OCI8
     case RUBY_PLATFORM
     when /mswin32|cygwin|mingw32|bccwin32/
 
-      require 'Win32API'
+      require 'fiddle/import'
+      require 'fiddle/types'
+
+      extend Fiddle::Importer
+      dlload 'kernel32.dll'
+      include Fiddle::BasicTypes
+      include Fiddle::Win32Types
+
+      typealias "HANDLE", "void*"
+      typealias "HMODULE", "void*"
+      extern "DWORD GetModuleFileNameA(HMODULE, LPSTR, DWORD)"
+      extern "UINT GetSystemDirectoryA(LPCSTR, UINT)"
+      extern "UINT GetWindowsDirectoryA(LPCSTR, UINT)"
+      extern "HMODULE LoadLibraryExA(LPCSTR, HANDLE, DWORD)"
+      extern "BOOL FreeLibrary(HMODULE)"
+
       MAX_PATH = 260
-      GetModuleFileNameA = Win32API.new('kernel32.dll', 'GetModuleFileNameA', 'PPL', 'L')
-      GetSystemDirectoryA = Win32API.new('kernel32.dll', 'GetSystemDirectoryA', 'PL', 'L')
-      GetWindowsDirectoryA = Win32API.new('kernel32.dll', 'GetWindowsDirectoryA', 'PL', 'L')
-      LoadLibraryExA = Win32API.new('kernel32.dll', 'LoadLibraryExA', 'PPL', 'P')
-      FreeLibrary = Win32API.new('kernel32.dll', 'FreeLibrary', 'P', 'L')
-      LOAD_LIBRARY_AS_IMAGE_RESOURCE = 0x00000020
+      DONT_RESOLVE_DLL_REFERENCES = 0x00000001
 
       def self.check_os_specific_load_error(exc)
         case exc.message
@@ -23,25 +33,50 @@ class OCI8
             check_win32_pe_arch(File.join(path, '\OCI.DLL'), "Oracle client")
           end
         when /^OCI.DLL: 126\(/, /^126: / # "OCI.DLL: 126(The specified module could not be found.)" in English
-          handle = LoadLibraryExA.call('OCI.DLL', nil, LOAD_LIBRARY_AS_IMAGE_RESOURCE)
-          unless handle.null?
-            FreeLibrary.call(handle)
-            raise LoadError, <<EOS
-OCI.DLL is in the PATH but its dependent modules are not found.
+          oci_dll_files = dll_load_path_list.inject([]) do |files, path|
+            file = File.join(path, '\OCI.DLL')
+            files << file if File.exist?(file)
+            files
+          end
+          if oci_dll_files.empty?
+            raise LoadError, "Cannot find OCI.DLL in PATH."
+          end
+          if oci_dll_files.none? {|file| open(file, 'rb') {true} rescue false}
+            raise LoadError, "OCI.DLL in PATH isn't readable."
+          end
+          first_error = nil
+          oci_dll_files.each do |file|
+            begin
+              check_win32_pe_arch(file, "Oracle client")
+              valid_arch = true
+            rescue LoadError
+              first_error ||= $!
+              valid_arch = false
+            end
+            if valid_arch
+              handle = LoadLibraryExA(file, nil, DONT_RESOLVE_DLL_REFERENCES)
+              unless handle.null?
+                FreeLibrary(handle)
+                raise LoadError, <<EOS
+Cannot find DLLs depended by #{file}.
 See http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/install-instant-client.md#Windows
 EOS
+              end
+              break
+            end
           end
+          raise first_error if first_error
         end
       end # self.check_os_specific_load_error
 
       def self.dll_load_path_list
         buf = "\0" * MAX_PATH
         paths = []
-        paths << buf[0, GetModuleFileNameA.call(nil, buf, MAX_PATH)].force_encoding("locale").gsub(/\\[^\\]*$/, '')
-        paths << buf[0, GetSystemDirectoryA.call(buf, MAX_PATH)].force_encoding("locale")
-        paths << buf[0, GetWindowsDirectoryA.call(buf, MAX_PATH)].force_encoding("locale")
+        paths << buf[0, GetModuleFileNameA(nil, buf, MAX_PATH)].force_encoding("locale").gsub(/\\[^\\]*$/, '')
+        paths << buf[0, GetSystemDirectoryA(buf, MAX_PATH)].force_encoding("locale")
+        paths << buf[0, GetWindowsDirectoryA(buf, MAX_PATH)].force_encoding("locale")
         paths << "."
-        paths + ENV['PATH'].split(';')
+        paths + (ENV['PATH'].split(';').reject {|path| path.empty?})
       end # self.dll_load_path_list
 
       def self.check_win32_pe_arch(filename, package)

data/lib/oci8/cursor.rb

@@ -25,7 +25,11 @@ class OCI8
       @names = nil
       @con = conn
       @max_array_size = nil
+      @fetch_array_size = nil
+      @rowbuf_size = 0
+      @rowbuf_index = 0
       __initialize(conn, sql) # Initialize the internal C structure.
+      self.prefetch_rows = conn.instance_variable_get(:@prefetch_rows)
     end
 
     # explicitly indicate the date type of fetched value. run this
@@ -38,7 +42,7 @@ class OCI8
     #   cursor.define(2, Time)       # fetch the second column as Time.
     #   cursor.exec()
     def define(pos, type, length = nil)
-      bindobj = make_bind_object(:type => type, :length => length)
+      bindobj = make_bind_object({:type => type, :length => length}, @fetch_array_size || 1)
       __define(pos, bindobj)
       if old = @define_handles[pos - 1]
         old.send(:free)
@@ -126,6 +130,8 @@ class OCI8
       when :select_stmt
         __execute(0)
         define_columns() if @column_metadata.size == 0
+        @rowbuf_size = 0
+        @rowbuf_index = 0
         @column_metadata.size
       else
         __execute(1)
@@ -384,6 +390,7 @@ class OCI8
     # @param [Integer] rows The number of rows to be prefetched
     def prefetch_rows=(rows)
       attr_set_ub4(11, rows) # OCI_ATTR_PREFETCH_ROWS(11)
+      @prefetch_rows = rows
     end
 
     if OCI8::oracle_client_version >= ORAVER_12_1
@@ -468,7 +475,7 @@ class OCI8
 
     private
 
-    def make_bind_object(param)
+    def make_bind_object(param, fetch_array_size = nil)
       case param
       when Hash
         key = param[:type]
@@ -510,22 +517,37 @@ class OCI8
         OCI8::BindType::Mapping[key] = bindclass if bindclass
       end
       raise "unsupported datatype: #{key}" if bindclass.nil?
-      bindclass.create(@con, val, param, max_array_size)
+      bindclass.create(@con, val, param, fetch_array_size || max_array_size)
     end
 
+    @@use_array_fetch = false
+
     def define_columns
       # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5494
       num_cols = attr_get_ub4(18) # OCI_ATTR_PARAM_COUNT(18)
-      1.upto(num_cols) do |i|
-        parm = __paramGet(i)
-        define_one_column(i, parm) unless @define_handles[i - 1]
-        @column_metadata[i - 1] = parm
+      @column_metadata = 1.upto(num_cols).collect do |i|
+        __paramGet(i)
+      end
+      if @define_handles.size == 0
+        use_array_fetch = @@use_array_fetch
+        @column_metadata.each do |md|
+          case md.data_type
+          when :clob, :blob, :bfile
+            # Rows prefetching doesn't work for CLOB, BLOB and BFILE.
+            # Use array fetching to get more than one row in a network round trip.
+            use_array_fetch = true
+          end
+        end
+        @fetch_array_size = @prefetch_rows if use_array_fetch
+      end
+      @column_metadata.each_with_index do |md, i|
+        define_one_column(i + 1, md) unless @define_handles[i]
       end
       num_cols
     end
 
     def define_one_column(pos, param)
-      bindobj = make_bind_object(param)
+      bindobj = make_bind_object(param, @fetch_array_size || 1)
       __define(pos, bindobj)
       @define_handles[pos - 1] = bindobj
     end
@@ -540,22 +562,33 @@ class OCI8
       end
     end
 
+    def fetch_row_internal
+      if @rowbuf_size && @rowbuf_size == @rowbuf_index
+        @rowbuf_size = __fetch(@con, @fetch_array_size || 1)
+        @rowbuf_index = 0
+      end
+      @rowbuf_size
+    end
+
     def fetch_one_row_as_array
-      if __fetch(@con)
-        @define_handles.collect do |handle|
-          handle.send(:get_data)
+      if fetch_row_internal
+        ret = @define_handles.collect do |handle|
+          handle.send(:get_data, @rowbuf_index)
         end
+        @rowbuf_index += 1
+        ret
       else
         nil
       end
     end
 
     def fetch_one_row_as_hash
-      if __fetch(@con)
+      if fetch_row_internal
         ret = {}
         get_col_names.each_with_index do |name, idx|
-          ret[name] = @define_handles[idx].send(:get_data)
+          ret[name] = @define_handles[idx].send(:get_data, @rowbuf_index)
         end
+        @rowbuf_index += 1
         ret
       else
         nil

data/lib/oci8/oci8.rb

@@ -169,7 +169,6 @@ class OCI8
   # @private
   def parse_internal(sql)
     cursor = OCI8::Cursor.new(self, sql)
-    cursor.prefetch_rows = @prefetch_rows if @prefetch_rows
     cursor
   end
 
@@ -305,6 +304,7 @@ class OCI8
   # @return [Array] an array of first row.
   def select_one(sql, *bindvars)
     cursor = self.parse(sql)
+    cursor.prefetch_rows = 1
     begin
       cursor.exec(*bindvars)
       row = cursor.fetch

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.6.1"
+  VERSION = "2.2.10"
 end

data/lib/oci8.rb

@@ -11,8 +11,11 @@ if RUBY_PLATFORM =~ /cygwin/
   # Cygwin manages environment variables by itself.
   # They don't synchroize with Win32's ones.
   # This set some Oracle's environment variables to win32's enviroment.
-  require 'Win32API'
-  win32setenv = Win32API.new('Kernel32.dll', 'SetEnvironmentVariableA', 'PP', 'I')
+  require 'fiddle'
+  win32setenv = Fiddle::Function.new( Fiddle.dlopen('Kernel32.dll')['SetEnvironmentVariableA'],
+                                        [Fiddle::TYPE_VOIDP,Fiddle::TYPE_VOIDP],
+                                        Fiddle::TYPE_INT )
+
   ['NLS_LANG', 'TNS_ADMIN', 'LOCAL'].each do |name|
     val = ENV[name]
     win32setenv.call(name, val && val.dup)
@@ -63,6 +66,8 @@ when 'rbx'
   so_basename += 'rbx'
 when 'jruby'
   raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
+when 'truffleruby'
+  so_basename += 'truffleruby'
 else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
@@ -95,7 +100,7 @@ begin
 
   ruby_arch = [nil].pack('P').size == 8 ? :x64 : :x86
   ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    if dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
+    if !path.empty? && dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
       dll_dir = RubyInstaller::Runtime.add_dll_directory(path)
       break
     end
@@ -105,7 +110,7 @@ end
 
 begin
   require so_basename
-rescue LoadError, OCIError
+rescue LoadError
   require 'oci8/check_load_error'
   OCI8::Util::check_load_error($!)
   raise

data/ruby-oci8.gemspec

@@ -34,7 +34,6 @@ spec = Gem::Specification.new do |s|
   s.description = <<EOS
 ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle 10g or later including Oracle Instant Client.
 EOS
-  s.has_rdoc = 'yard'
   s.authors = ['Kubo Takehiro']
   s.platform = gem_platform
   s.license = 'BSD-2-Clause'
@@ -51,7 +50,7 @@ EOS
     # add map files to analyze a core (minidump) file.
     so_vers.each do |ver|
       map_file = 'ext/oci8/oci8lib_#{ver}.map'
-      so_files << map_file if File.exists? map_file
+      so_files << map_file if File.exist? map_file
     end
 
     # least version in so_vers
@@ -79,7 +78,7 @@ EOS
     end
     files << 'lib/oci8.rb'
   end
-  s.require_paths = ['lib', 'ext/oci8']
+  s.require_paths = ['lib']
   s.files = files
   s.test_files = 'test/test_all.rb'
   s.extra_rdoc_files = ['README.md']

data/setup.rb

@@ -189,7 +189,16 @@ class ConfigTable
                      'the make program to compile ruby extentions' ] ],
     [ 'without-ext', [ 'no',
                        'yes/no',
-                       'does not compile/install ruby extentions' ] ]
+                       'does not compile/install ruby extentions' ] ],
+    [ 'with-instant-client-dir', ['',
+                                  'path',
+                                  'path to the Oracle instant client directory'] ],
+    [ 'with-instant-client-lib', ['',
+                                  'path',
+                                  'path to the Oracle instant client libraries'] ],
+    [ 'with-instant-client-include', ['',
+                                      'path',
+                                      'path to the Oracle instant client header files'] ]
   ]
   multipackage_descripters = [
     [ 'with',      [ '',
@@ -277,7 +286,7 @@ class ConfigTable
 
   def initialize_from_table
     @table = {}
-    DESCRIPTER.each do |k, (default, vname, desc, default2)|
+    DESCRIPTER.each do |k, (default, *)|
       @table[k] = default
     end
   end

data/test/README.md

@@ -0,0 +1,37 @@
+Before running unit test:
+
+1. Connect to Oracle as sys
+   ```shell
+   $ sqlplus sys/<password_of_sys> as sysdba
+   SQL>
+   ```
+2. Create user ruby
+   ```sql
+   SQL> CREATE USER ruby IDENTIFIED BY oci8 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
+   SQL> alter user ruby quota unlimited on users;
+   ```
+3. Grant the privilege to connect and execute.
+   ```sql
+    SQL> GRANT connect, resource, create view, create synonym TO ruby;
+    SQL> GRANT execute ON dbms_lock TO ruby;
+    ```
+4. Connect as ruby user.
+   ```shell
+   $ sqlplus ruby/oci8
+   SQL>
+   ```
+5. Create object types
+   ```sql
+   SQL> @test/setup_test_object.sql
+   SQL> @test/setup_test_package.sql
+   ```
+6. change $dbname in test/config.rb.
+
+Then run the following command:
+```shell
+$ make check
+```
+or
+```
+$ nmake check   (If your compiler is MS Visual C++.)
+````

data/test/config.rb

@@ -134,7 +134,7 @@ class Minitest::Test
 
   def get_oci8_connection()
     OCI8.new($dbuser, $dbpass, $dbname)
-      rescue OCIError
+  rescue OCIError
     raise if $!.code != 12516 && $!.code != 12520
     # sleep a few second and try again if
     # the error code is ORA-12516 or ORA-12520.

data/test/test_break.rb

@@ -22,9 +22,8 @@ class TestBreak < Minitest::Test
   @@server_is_runing_on_windows = nil
   def server_is_runing_on_windows?
     if @@server_is_runing_on_windows.nil?
-      @@server_is_runing_on_windows = false
-      @conn.exec('select banner from v$version') do |row|
-        @@server_is_runing_on_windows = true if row[0].include? 'Windows'
+      @conn.exec('select dbms_utility.port_string from dual') do |row|
+        @@server_is_runing_on_windows = row[0].include? '/WIN'
       end
     end
     @@server_is_runing_on_windows
@@ -63,7 +62,7 @@ class TestBreak < Minitest::Test
     expect = []
     expect[PLSQL_DONE] = TIME_IN_PLSQL
     expect[OCIBREAK]   = "Invalid status"
-    if defined? Rubinius and Rubinius::VERSION >= "2.0"
+    if (defined? Rubinius and Rubinius::VERSION >= "2.0") || (defined? RUBY_ENGINE and RUBY_ENGINE == "truffleruby")
       # Rubinius 2.0.0.
       # DBMS_LOCK.SLEEP blocks ruby threads which try to call C-API.
       expect[SEND_BREAK] = TIME_TO_BREAK
@@ -100,6 +99,11 @@ class TestBreak < Minitest::Test
   def test_timeout
     @conn.non_blocking = true
     start_time = Time.now
+    if server_is_runing_on_windows?
+      end_time = start_time + 5
+    else
+      end_time = start_time + 1
+    end
 
     if defined? Rubinius and Rubinius::VERSION < "2.0"
       # Rubinius 1.2.4
@@ -113,12 +117,8 @@ class TestBreak < Minitest::Test
         @conn.exec("BEGIN DBMS_LOCK.SLEEP(5); END;")
       end
     end
-    if server_is_runing_on_windows?
-      end_time = start_time + 5
-    else
-      end_time = start_time + 1
-    end
     assert_in_delta(Time.now, end_time, 1)
+    sleep(0.01) # for truffleruby. Is truffleruby too fast?
     @conn.exec("BEGIN NULL; END;")
     assert_in_delta(Time.now, end_time, 1)
   end

data/test/test_datetime.rb

@@ -1,6 +1,5 @@
 require 'oci8'
 require File.dirname(__FILE__) + '/config'
-require 'scanf'
 
 class TestDateTime < Minitest::Test
 
@@ -28,6 +27,12 @@ class TestDateTime < Minitest::Test
     convert_to_datetime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, subsec, $8)
   end
 
+  # 'YYYY-MM-DD HH24:MI:SS' or 'YYYY-MM-DD HH24:MI:SS.FF6' to array
+  def string_to_array(str)
+    /(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(?:\.(\d+))?/ =~ str
+    [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, $7 ? $7.to_i / 1000 : 0]
+  end
+
   def setup
     @conn = get_oci8_connection
   end
@@ -43,7 +48,7 @@ class TestDateTime < Minitest::Test
       @conn.exec(<<-EOS) do |row|
 SELECT TO_DATE('#{date}', 'YYYY-MM-DD HH24:MI:SS') FROM dual
 EOS
-        assert_equal(Time.local(*date.scanf("%d-%d-%d %d:%d:%d.%06d")), row[0])
+        assert_equal(Time.local(*string_to_array(date)), row[0])
       end
     end
   end
@@ -94,7 +99,7 @@ EOS
       @conn.exec(<<-EOS) do |row|
 SELECT TO_TIMESTAMP('#{date}', 'YYYY-MM-DD HH24:MI:SS.FF') FROM dual
 EOS
-        assert_equal(Time.local(*date.scanf("%d-%d-%d %d:%d:%d.%06d")), row[0])
+        assert_equal(Time.local(*string_to_array(date)), row[0])
       end
     end
   end