ruby-oci8 2.1.8-x86-mingw32 → 2.2.0-x86-mingw32

data/.yardopts

@@ -13,5 +13,6 @@ COPYING_old
 docs/install-full-client.md
 docs/install-instant-client.md
 docs/install-binary-package.md
+docs/install-on-osx.md
 docs/platform-specific-issues.md
 docs/report-installation-issue.md

data/ChangeLog

@@ -1,3 +1,163 @@
+2015-10-04  Kubo Takehiro  <kubo@jiubao.org>
+	* NEWS: Add changes between 2.1.8 and 2.2.0.
+
+2015-10-04  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: Fix compilation errors when --with-runtime-check
+	    is passed to extconf.rb.
+
+2015-10-04  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/stmt.c: Use OCIStmtPrepare2 as
+	    a local function, which doesn't require a server round-trip.
+	    Local functions are executed without releasing the GVL.
+
+2015-10-04  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-on-osx.md: Add notice that OCI_DIR is necessary
+	    when Homebrew is installed outside /usr/local.
+	* README.md: Add a link to install-on-osx.md.
+
+2015-10-03  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-on-osx.md: Merge GH-95: Add OCI_DIR export to
+	    Homebrew Installation Steps
+
+2015-09-29  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-on-osx.md, .yardopts: Add a new file for
+	    installation on OS X.
+	* docs/install-instant-client.md: Delete installation steps
+	    on OS X.
+
+2015-09-26  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/check_load_error.rb: Refactoring.
+
+2015-09-26  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/dist-files, ext/oci8/extconf.rb, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c, ext/oci8/osx.c: Revert the previous commit.
+
+2015-09-19  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/dist-files, ext/oci8/extconf.rb, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c, ext/oci8/osx.c: Intercept dlopen issued
+	    by libclntsh.dylib to make OCIEnvCreate() work without
+	    setting rpath to ruby itself.
+	    ** This commit was reverted. **
+
+2015-09-19  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Use OCI_DIR environmant variable also
+	   to check instant client directory on OS X.
+	    (github issue #89)
+
+2015-09-19  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.h: Define STRINGIZE macro for rubinius.
+
+2015-09-19  Kubo Takehiro  <kubo@jiubao.org>
+	* README.md: Update supported Oracle version.
+	* dist-files: Add lib/oci8/check_load_error.rb.
+	* ext/oci8/extconf.rb: Reduce the number of #define values.
+
+2015-09-17  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb: Change the driver name displayed in
+	    V$SESSION_CONNECT_INFO.CLIENT_DRIVER from "rubyoci8 : VERSION" to
+	    "ruby-oci8 : VERSION".
+	* test/test_oci8.rb: Fix a test checking the driver name.
+	    (github issue #93)
+
+2015-09-13  Kubo Takehiro  <kubo@jiubao.org>
+	* NEWS, docs/report-installation-issue.md, ext/oci8/oraconf.rb,
+	  lib/oci8/properties.rb, ruby-oci8.gemspec: Fix links to rubyforge.
+
+2015-09-13  Kubo Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: Use Kernel.load instead of load not to use Gem::Specification.load.
+
+2015-09-13  Kubo Takehiro  <kubo@jiubao.org>
+	* .gitignore: Ignore ext/oci8/*.bundle.
+
+2015-09-12  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c: Add notice that OCI8::LOB is an I/O object and is closed
+	    when a associating connection is closed.
+
+2015-09-12  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb: Add ruby-oci8 version to
+	    V$SESSION_CONNECT_INFO.CLIENT_DRIVER for Oracle 12.1.0.2 or later.
+	    (suggested by Christopher Jones)
+
+2015-08-24  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/lob.c: Support LOB whose size is
+	    over 4G.
+
+2015-08-23  Kubo Takehiro  <kubo@jiubao.org>
+	* dist-files: Add ext/oci8/util.c.
+
+2015-07-12  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-instant-client.md: Add instant client installation
+	    instructions on OS X using homebrew.
+
+2015-07-12  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.rb: Check DYLD_FALLBACK_LIBRARY_PATH also on
+	    installation. (OS X only)
+
+2015-07-11  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c, ext/oci8/util.c, ext/oci8/win32.c,
+	  lib/oci8/encoding-init.rb: Delete OCI8::Win32Util.dll_path
+	    and add OCI8::Util.dll_path, which works on Linux, Solaris,
+	    OS X and HP-UX in addition to Windows.
+
+2015-06-26  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb, lib/oci8/check_load_error.rb: Check the message of
+	    LoadError and raise more user-friendly message.
+
+2015-06-23  Kubo Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: Load oci8/version.rb temporarily and delete OCI8.
+	    Some 'bundler' tasks load 'ruby-oci8.gemspec' before 'require "oci8"'
+	    and fail with 'TypeError: superclass mismatch for class OCI8.'
+	    (github issue #80)
+
+2015-06-21  Kubo Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: Use ruby-oci8 version in lib/oci8/version.rb
+	    instead of VERSION file to generate gem.
+	    (github issue #79)
+
+2015-06-21  Kubo Takehiro  <kubo@jiubao.org>
+	* Makefile, dist-files, ext/oci8/extconf.rb, ext/oci8/oci8.c: Use
+	   ruby-oci8 version in lib/oci8/version.rb instead of VERSION file.
+	* VERSION: Deleted
+	* lib/oci8/version.rb: Added
+	* lib/oci8.rb, lib/oci8.rb.in: Renamed lib/oci8.rb to lib/oci8.rb.in.
+
+2015-06-21  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/encoding-init.rb: Get Oracle client charset name from
+	    the environment handle instead of NLS_LANG.
+
+2015-06-20  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.h: Fix a compilation error.
+
+2015-06-20  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb: Change the default prefetch rows size 100.
+
+2015-06-20  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb: Delete an object file created by extconf.rb
+	    before compilation.
+	    (github issue #75)
+
+2015-06-20  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/stmt.c:
+	    Delete unreachable code which was created when Oracle 9i support was dropped.
+
+2015-05-24  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/encoding.c: Add OCI8.charset_name2id and OCI8.charset_id2name.
+	    Mark OCI8#charset_name2id and OCI8#charset_id2name as deprecated.
+
+2015-05-23  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/bind.c, ext/oci8/encoding.c, ext/oci8/error.c, ext/oci8/oci8.c,
+	  ext/oci8/oci8lib.c, ext/oci8/ocidatetime.c, ext/oci8/stmt.c,
+	  lib/oci8/metadata.rb, lib/oci8/properties.rb:
+	    Drop Oracle 9i support.
+
+2015-05-22  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.c.tmpl, ext/oci8/encoding.c, ext/oci8/env.c,
+	  ext/oci8/extconf.rb, ext/oci8/lob.c, ext/oci8/oci8.c, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c, ext/oci8/ocinumber.c, ext/oci8/thread_util.c,
+	  ext/oci8/thread_util.h, lib/oci8/bindtype.rb, lib/oci8/encoding-init.rb,
+	  lib/oci8/oci8.rb: Drop ruby 1.8 support.
+
 2015-04-04  Kubo Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.1.7 and 2.1.8.
 	* VERSION: update to 2.1.8.

data/Makefile

@@ -1,9 +1,9 @@
-VERSION = `cat VERSION`
+VERSION = `$(RUBY) -I. -rlib/oci8/version.rb -e "print OCI8::VERSION"`
 RUBY = ruby -w
 
 all: build
 
-config.save: lib/oci8.rb.in
+config.save:
 	$(RUBY) setup.rb config
 
 build: config.save

data/NEWS

@@ -1,5 +1,47 @@
 # @markup markdown
 
+2.2.0
+=====
+
+### Drop ruby 1.8 support
+
+Use ruby-oci8 2.1.8 for ruby 1.8.
+
+### Drop Oracle 9i support
+
+Use ruby-oci8 2.1.8 for Oracle 9i.
+
+New Features
+------------
+
+### Support LOB over 4G
+
+### Fix to install ruby-oci8 on OS X 10.11 El Capitan.
+
+`DYLD_LIBRARY_PATH` is unset for security reasons on OS X 10.11.
+The installtion script was changed to work without `DYLD_LIBRARY_PATH`
+and check the environment variable `OCI_DIR` also to tell instant
+client directory.
+
+Other Changes
+-------------
+
+-   Change the default prefetch row size to 100.
+
+-   Add notice that OCI8::LOB is an I/O object and is closed
+    when a associating connection is closed.
+
+-   Add ruby-oci8 version the driver name, which is displayed in 
+    `V$SESSION_CONNECT_INFO.CLIENT_DRIVER` for Oracle 12.1.0.2 or later.
+    (suggested by Christopher Jones)
+
+-   Use `Kernel.load` in ruby-oci8.gemspec instead of `load`.
+    `load`, without the module name, is used as `Gem::Specification.load`
+    by some ruby installations.
+
+-   Add OCI8.charset_name2id and OCI8.charset_id2name.
+    Mark OCI8#charset_name2id and OCI8#charset_id2name as deprecated.
+
 2.1.8
 =====
 
@@ -250,7 +292,7 @@ Fixed Issues
 ------------
 
 -   delete code which overwrites signal handlers registered by ruby.
-    See: [rubyforge thread 50690](http://rubyforge.org/forum/forum.php?thread_id=50690&forum_id=1078)
+    See: [rubyforge thread 50690](https://web.archive.org/web/20140521194940/https://rubyforge.org/forum/forum.php?thread_id=50690&forum_id=1078)
 
 -   fix internal heap error in OCI.
     See: [github issue #12](https://github.com/kubo/ruby-oci8/issues/12)
@@ -463,7 +505,7 @@ You need to set "`OCI8.properties[:bind_string_as_nchar] = true`"
 if the database character set is not UTF-8 and 'NCHAR'/'NVARCHAR2' columns
 contain characters which cannot be converted to the database character set.
 
-See: {http://rubyforge.org/forum/forum.php?thread\_id=48838&forum\_id=1078}
+See: [rubyforge thread 48838](https://web.archive.org/web/20140519033641/http://rubyforge.org/forum/forum.php?thread_id=48838&forum_id=1078)
 
 Fixed issues
 ------------
@@ -472,13 +514,13 @@ Fixed issues
 
     (reported by Jordan Curzon and Aaron Qian)
 
-    See: {http://rubyforge.org/forum/forum.php?thread\_id=49751&forum\_id=1078}
+    See: [rubyforge thread 49751](https://web.archive.org/web/20140519033653/http://rubyforge.org/forum/forum.php?thread_id=49751&forum_id=1078)
 
 -   Raise "OCIError: ORA-01805: possible error in date/time operation"
     when Oracle 11gR2's client and server timezone versions are not same
     instead of raising a exception "undefined method `*' for nil:NilClass."
 
-    See: {http://rubyforge.org/forum/forum.php?thread\_id=49102&forum\_id=1078}
+    See: [rubyforge thread 49102](https://web.archive.org/web/20140521194951/https://rubyforge.org/forum/forum.php?thread_id=49102&forum_id=1078)
 
 -   Fix unexpectedly disconnect when failed-logon connections is GC'ed
     and the connection object's address is accidentally same with
@@ -756,7 +798,7 @@ Fixed installation issues
 
 *   fix an error when executing "select NULL from dual".
 
-    {http://rubyforge.org/forum/forum.php?thread\_id=32468&forum\_id=1078}
+    [rubyforge thread 32468](https://web.archive.org/web/20140521152939/http://rubyforge.org/forum/forum.php?thread_id=32468&forum_id=1078)
     (contributed by Raimonds Simanovskis)
 
 *   [ruby 1.9] fix OCI8::BLOB to read/write binary. Prior to 2.0.1,

data/README.md

@@ -2,10 +2,10 @@ What is ruby-oci8
 =================
 
 Ruby-oci8 is a ruby interface for Oracle Database. The latest version
-is available for all Oracle versions after Oracle 9i including Oracle
+is available for all Oracle versions after Oracle 10g including Oracle
 Instant Client.
 
-If you need to use Oracle 8, use ruby-oci8 2.0.6.
+Use ruby-oci8 2.0.6 for Oracle 8 or use ruby-oci8 2.1.8 for Oracle 9i.
 
 What's new
 ==========
@@ -32,6 +32,7 @@ Installation
 * {file:docs/install-full-client.md Install for Oracle Full Client}
 * {file:docs/install-instant-client.md Install for Oracle Instant Client}
 * {file:docs/install-binary-package.md Install Binary Package}
+* {file:docs/install-on-osx.md Install on OS X}
 
 Report issues
 =============

data/dist-files

@@ -5,7 +5,6 @@ ChangeLog
 Makefile
 NEWS
 README.md
-VERSION
 dist-files
 metaconfig
 pre-distclean.rb
@@ -51,12 +50,14 @@ ext/oci8/post-config.rb
 ext/oci8/stmt.c
 ext/oci8/thread_util.c
 ext/oci8/thread_util.h
+ext/oci8/util.c
 ext/oci8/win32.c
 lib/.document
-lib/oci8.rb.in
+lib/oci8.rb
 lib/dbd/OCI8.rb
 lib/oci8/.document
 lib/oci8/bindtype.rb
+lib/oci8/check_load_error.rb
 lib/oci8/compat.rb
 lib/oci8/connection_pool.rb
 lib/oci8/cursor.rb
@@ -69,6 +70,7 @@ lib/oci8/oci8.rb
 lib/oci8/ocihandle.rb
 lib/oci8/oracle_version.rb
 lib/oci8/properties.rb
+lib/oci8/version.rb
 test/README
 test/config.rb
 test/setup_test_object.sql
@@ -93,4 +95,5 @@ test/test_oci8.rb
 test/test_oracle_version.rb
 test/test_oradate.rb
 test/test_oranumber.rb
+test/test_package_type.rb
 test/test_rowid.rb

data/docs/install-instant-client.md

@@ -5,10 +5,13 @@ Introduction
 
 This page explains the way to install ruby-oci8 for Oracle Instant Client.
 
-For Oracle Full Client, look at {file:docs/install-full-client.md}.
-For Windows, look at {file:docs/install-binary-package.md} unless you
+Look at {file:docs/install-full-client.md} for Oracle Full Client.
+
+Look at {file:docs/install-binary-package.md} for Windows unless you
 have a special need to compile ruby-oci8 by yourself.
 
+Look at {file:docs/install-on-osx.md} for OS X.
+
 Install Oracle Instant Client Packages
 ======================================
 
@@ -43,7 +46,6 @@ a symbolic link to link the library.
 Note:
 
 * use libclntsh.sl instead of libclntsh.so on HP-UX PA-RISC.
-* use libclntsh.dylib instead of libclntsh.so on Mac OS X.
 * skip this step for AIX.
 * run `yum install libaio` also on Redhat.
 * run `apt-get install libaio1` also on Ubuntu.
@@ -62,10 +64,10 @@ the installed directory.
   <tr><td> HP-UX PA-RISC 32-bit ruby </td><td> SHLIB_PATH                            </td></tr>
   <tr><td> HP-UX PA-RISC 64-bit ruby </td><td> LD_LIBRARY_PATH                       </td></tr>
   <tr><td> HP-UX IA64                </td><td> LD_LIBRARY_PATH                       </td></tr>
-  <tr><td> Mac OS X                  </td><td> DYLD_LIBRARY_PATH                     </td></tr>
   <tr><td> AIX                       </td><td> LIBPATH                               </td></tr>
 </tbody>
 </table>
+Note: Look at {file:docs/install-on-osx.md} for OS X.
 
 For example:
 
@@ -105,7 +107,7 @@ Oracle installation
 -------------------
 
 Run the following command and confirm it works fine. If it doesn't
-work well, check LD\_LIBRARY\_PATH or PATH.
+work well, check `LD_LIBRARY_PATH` or PATH.
 
     sqlplus USERNAME/PASSWORD
 

data/docs/report-installation-issue.md

@@ -1,13 +1,10 @@
 # @title Report Installation Issues
 
-Look at {file:docs/platform-specific-issues.md},
-[the issues page on github][github] and [the ruby-oci8 help forum on rubyforge][rubyforge]
-to check whether your issue is fixed or not.
+Look at {file:docs/platform-specific-issues.md} and [the issues page on github][github] to check whether your issue is fixed or not.
 
 If it is a new one, post the following information to [github][].
 
 [github]: https://github.com/kubo/ruby-oci8/issues
-[rubyforge]: http://rubyforge.org/forum/forum.php?forum_id=1078
 
 *    Messages printed out to the console
 

data/lib/oci8.rb

@@ -67,12 +67,20 @@ when 'jruby'
 else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
-require so_basename
 
-if OCI8::VERSION != '2.1.8'
+begin
+  require so_basename
+rescue LoadError, OCIError
+  require 'oci8/check_load_error'
+  OCI8::Util::check_load_error($!)
+  raise
+end
+
+require 'oci8/version.rb'
+if OCI8::VERSION != OCI8::LIB_VERSION
   require 'rbconfig'
   so_name = so_basename + "." + RbConfig::CONFIG['DLEXT']
-  raise "VERSION MISMATCH! #{so_name} version is #{OCI8::VERSION}, but oci8.rb version is 2.1.8."
+  raise "VERSION MISMATCH! #{so_name} version is #{OCI8::LIB_VERSION}, but oci8.rb version is #{OCI8::VERSION}."
 end
 
 require 'oci8/encoding-init.rb'

data/lib/oci8/bindtype.rb

@@ -115,18 +115,12 @@ class OCI8
                 param[:length] = val.size
               else
                 # byte semantics
-                if OCI8.respond_to? :encoding and OCI8.encoding != val.encoding
+                if OCI8.encoding != val.encoding
                   # If the string encoding is different with NLS_LANG character set,
                   # convert it to get the length.
                   val = val.encode(OCI8.encoding)
                 end
-                if val.respond_to? :bytesize
-                  # ruby 1.8.7 or upper
-                  param[:length] = val.bytesize
-                else
-                  # ruby 1.8.6 or lower
-                  param[:length] = val.size
-                end
+                param[:length] = val.bytesize
               end
             else
               param[:length] = @@minimum_bind_length
@@ -166,11 +160,7 @@ class OCI8
           unless param[:length]
             if val.respond_to? :to_str
               val = val.to_str
-              if val.respond_to? :bytesize
-                param[:length] = val.bytesize
-              else
-                param[:length] = val.size
-              end
+              param[:length] = val.bytesize
             else
               param[:length] = 400
             end