ruby-oci8 2.2.7-x86-mingw32 → 2.2.8-x86-mingw32

data/ChangeLog

@@ -1,3 +1,93 @@
+2020-01-11  Kubo Takehiro <kubo@jiubao.org>
+	* NEWS: Add changes between 2.2.7 and 2.2.8.
+	* lib/oci8/version.rb: Update to 2.2.8.
+
+2020-01-11  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/bind.c: Fix warning: comparison between signed and
+	    unsigned integer expressions
+
+2020-01-11  Kubo Takehiro <kubo@jiubao.org>
+	* test/README.md: Update preparation SQL statements for running tests.
+
+2020-01-11  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_break.rb: Check Oracle server OS where tests run
+	    using dbms_utility.port_string. Tests in test_break.rb
+	    failed on Windows.
+
+2020-01-07  Kubo Takehiro <kubo@jiubao.org>
+	* mkpkg-win32.rb: Workarounds for compilation using ruby 2.4 and 2.6 with
+	    latest msys2 to avoid 'undefined reference to __chk_fail'
+
+2020-01-06  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/win32.c: Fix warnings caused by the change of rb_ensure()'s
+	    arguments in ruby 2.7.
+
+2019-12-16  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_datetime.rb: Remove "require 'scanf'" to run tests with Ruby 2.7.
+	    The 'scanf' library was removed. https://bugs.ruby-lang.org/issues/16170
+
+2019-12-15  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/oradate.c: Fix bug of OraDate.now introduced 15 years ago.
+
+2019-12-15  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/attr.c, ext/oci8/oci8lib.c: Fix warnings caused by the
+	    change of rb_ensure()'s arguments in ruby 2.7.
+
+2019-06-19  Kubo Takehiro <kubo@jiubao.org>
+	* Merge pull request #217 from nathanbwright/patch-1
+	  Fix spelling in install-instant-client.md
+	  (GH-217)
+
+2019-06-18  Nathan Wright <nathanbwright@users.noreply.github.com>
+	* docs/install-instant-client.md: Fix spelling in install-instant-client.md
+	    (GH-217)
+
+2019-04-24  Kubo Takehiro <kubo@jiubao.org>
+	* Merge pull request #212 from tomasjura/master
+	  Compilation fix for Windows ( and some small cleanups )
+	  (GH-212)
+
+2019-04-23  Tomas Jura <tomas.jura1@gmail.com>
+	* ext/oci8/oci8.h: eliminate compiler warning
+	    (GH-212)
+
+2019-04-20  Tomas Jura <tomas.jura1@gmail.com>
+	* ext/oci8/bind.c: compiler warning eliminated
+	    (GH-212)
+
+2019-04-20  Tomas Jura <tomas.jura1@gmail.com>
+	* setup.rb: use splat operator instead dummy variables
+	    (GH-212)
+
+2019-04-20  Tomas Jura <tomas.jura1@gmail.com>
+	* lib/oci8.rb: use fiddler instead obsolete Win32API
+	    (GH-212)
+
+2019-04-20 Tomas Jura <tomas.jura1@gmail.com>
+	* ext/oci8/oraconf.rb: fix typo in windows compilation
+	    (GH-212)
+
+2019-03-23 Kubo Takehiro <kubo@jiubao.org>
+	* Merge pull request #210 from dminuoso/allow-custom
+	  (Nix) Allow for specifying include/library paths
+	  (GH-210)
+
+2019-03-23 Victor Nawothnig <Victor.Nawothnig@gmail.com>
+	* ext/oci8/oraconf.rb: Fix missing support for full client
+	    (GH-210)
+
+2019-03-22  Victor Nawothnig <Victor.Nawothnig@gmail.com>
+	* ext/oci8/oraconf.rb: fixup! Allow overriding library/include paths
+	    (GH-210)
+
+2019-03-21  Victor Nawothnig <Victor.Nawothnig@gmail.com>
+	* setup.rb: Add documentation for new flags
+	    (GH-210)
+
+2019-03-21  Victor Nawothnig <Victor.Nawothnig@gmail.com>
+	* ext/oci8/oraconf.rb: Allow overriding library/include paths
+	    (GH-210)
+
 2019-01-06  Kubo Takehiro <kubo@jiubao.org>
 	* NEWS: Add changes between 2.2.6.1 and 2.2.7.
 	* lib/oci8/version.rb: Update to 2.2.7

data/NEWS

@@ -1,5 +1,30 @@
 # @markup markdown
 
+2.2.8 (2020-01-11)
+==================
+
+New features
+------------
+
+* Add support to specify include and lib directories of Oracle library on installation. (GH-210)
+
+  The following three flags are added.
+  
+  * --with-instant-client-dir
+  * --with-instant-client-include
+  * --with-instant-client-lib
+
+Fixed issue
+-----------
+
+- Suppress warnings compiling oci8lib.so (GH-212 and others)
+
+- Fix compilation and tests on Windows.
+
+- Fix spelling in install-instant-client.md (GH-217)
+
+- Use fiddler instead obsolete Win32API on Windows (GH-212)
+
 2.2.7 (2019-01-06)
 ==================
 

data/docs/install-instant-client.md

@@ -18,7 +18,7 @@ Look at {file:docs/install-on-osx.md} for OS X.
 Install Oracle Instant Client Packages
 --------------------------------------
 
-### Donwload Instant Client Packages
+### Download Instant Client Packages
 
 Download the following packages from [Oracle Technology Network](http://www.oracle.com/technetwork/database/features/instant-client/index-097480.html).
 

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)

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.7"
+  VERSION = "2.2.8"
 end

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

@@ -7,12 +7,8 @@ Before running unit test:
    ```
 2. Create user ruby
    ```sql
-   SQL> CREATE USER ruby IDENTIFIED BY oci8;
-   ```
-   or
-   ```sql
-   SQL> CREATE USER ruby IDENTIFIED BY oci8
-      2 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
+   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
@@ -27,6 +23,7 @@ Before running unit test:
 5. Create object types
    ```sql
    SQL> @test/setup_test_object.sql
+   SQL> @test/setup_test_package.sql
    ```
 6. change $dbname in test/config.rb.
 

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

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 2
   - 2
-  - 7
-  version: 2.2.7
+  - 8
+  version: 2.2.8
 platform: x86-mingw32
 authors: 
 - Kubo Takehiro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2019-01-06 00:00:00 +09:00
+date: 2020-01-11 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -114,6 +114,7 @@ files:
 - lib/oci8lib_240.so
 - lib/oci8lib_250.so
 - lib/oci8lib_260.so
+- lib/oci8lib_270.so
 has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
 licenses: