ruby-oci8 2.1.6 → 2.1.7

data/ChangeLog

@@ -1,3 +1,24 @@
+2014-02-02  Kubo Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.1.7 and 2.1.6.
+	* VERSION: change the version to 2.1.7.
+
+2014-01-25  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: Follow ABI versioning after ruby 2.1.0.
+
+2014-01-19  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-full-client.md, docs/install-instant-client.md: Change down
+	    load URL and filenames in examples.
+
+2014-01-06  Kubo Takehiro  <kubo@jiubao.org>
+	* README.md, docs/install-full-client.md, docs/install-instant-client.md,
+	  docs/report-installation-issue.md, ext/oci8/oraconf.rb, ruby-oci8.gemspec:
+	    Move the project page and download URL to github.
+
+2014-01-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/metadata.c, ext/oci8/oci8.h, lib/oci8/metadata.rb:
+	    Fix OCI8#describe_table to follow synonyms in a remote database.
+	    Add OCI8::Metadata::Base#obj_link.
+
 2013-12-29  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.1.6 and 2.1.5.
 	* VERSION: change the version to 2.1.6.

data/NEWS

@@ -1,5 +1,18 @@
 # @markup markdown
 
+2.1.7
+=====
+
+New Features
+------------
+
+### Add OCI8::Metadata::Base#obj_link.
+
+Fixed Issues
+------------
+
+-   Fix OCI8#describe_table to follow synonyms in a remote database.
+
 2.1.6
 =====
 

data/README.md

@@ -21,20 +21,23 @@ Connect to scott/tiger, select `emp` and print as CSV format.
 
 If you install a ruby-oci8 gem package, you may need to add `-rubygems` before `-r oci8`.
 
-Documantation
+API Reference
 =============
 
-* [Reference Manual](http://ruby-oci8.rubyforge.org/en/)
-* {file:docs/install-full-client.md}
-* {file:docs/install-instant-client.md}
-* {file:docs/install-binary-package.md}
+* http://rubydoc.info/gems/ruby-oci8/frames/file/README.md
+
+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}
 
 Report issues
 =============
 
 * {file:docs/report-installation-issue.md}
 * [The issues page on github](https://github.com/kubo/ruby-oci8/issues)
-* [The ruby-oci8 help forum on rubyforge](http://rubyforge.org/forum/forum.php?forum_id=1078)
 
 License
 =======

data/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

data/docs/install-full-client.md

@@ -90,8 +90,7 @@ tar.gz package
 
 ### Download the source code
 
-Download the latest tar.gz package such as ruby-oci8 2.1.0.tar.gz,
-which is the latest version at the time of writing, from [rubyforge][].
+Download the latest tar.gz package from [download page][].
 
 ### Run make and install
 
@@ -107,10 +106,9 @@ note: If you use '`sudo`', use it only when running '`make install`'.
 
 #### Windows(mswin32)
 
-
     gzip -dc ruby-oci8-VERSION.tar.gz | tar xvf -
     cd ruby-oci8-VERSION
     nmake
     nmake install
 
-[rubyforge]: http://rubyforge.org/frs/?group_id=256
+[download page]: https://bintray.com/kubo/generic/ruby-oci8

data/docs/install-instant-client.md

@@ -34,11 +34,11 @@ Unzip the packages as follows:
     unzip path/to/instantclient-sdk-OS-VERSION.zip
     unzip path/to/instantclient-sqlplus-OS-VERSION.zip
 
-If /opt/oracle/instantclient10_1/libclntsh.so is not found, make
+If /opt/oracle/instantclient12_1/libclntsh.so is not found, make
 a symbolic link to link the library.
 
-    cd /opt/oracle/instantclient10_1
-    ln -s libclntsh.so.10.1 libclntsh.so
+    cd /opt/oracle/instantclient12_1
+    ln -s libclntsh.so.12.1 libclntsh.so
 
 Note:
 
@@ -66,9 +66,15 @@ the installed directory.
 </table>
 
 For example:
-    $ LD_LIBRARY_PATH=/opt/oracle/instantclient_10_2
+
+    $ LD_LIBRARY_PATH=/opt/oracle/instantclient_12_1
     $ export LD_LIBRARY_PATH
 
+Though many instant client pages indicate that the environment varialbe
+`ORACLE_HOME` should be set, it isn't necessary unless Oracle Net
+configuration files such as `tnsnames.ora` and `sqlnet.ora` are in
+`$ORACLE_HOME/network/admin/`.
+
 Linux rpm packages
 ------------------
 
@@ -81,7 +87,8 @@ Install the downloaded packages as follows:
 Set LD_LIBRARY_PATH to point to the directory where libclntsh.so is installed.
 
 For example:
-    $ LD_LIBRARY_PATH=/usr/lib/oracle/10.2.0.3/client/lib
+
+    $ LD_LIBRARY_PATH=/usr/lib/oracle/12.1/client/lib
     $ export LD_LIBRARY_PATH
 
 Windows
@@ -138,8 +145,7 @@ tar.gz package
 
 ### Download the source code
 
-Download the latest tar.gz package such as ruby-oci8 2.1.0.tar.gz,
-which is the latest version at the time of writing, from [rubyforge][].
+Download the latest tar.gz package from [download page][].
 
 Note: if you are using Windows and you have no special need to compile
 it by yourself, look at {file:docs/install-binary-packge.md}.
@@ -158,10 +164,9 @@ note: If you use '`sudo`', use it only when running '`make install`'.
 
 #### Windows(mswin32)
 
-
     gzip -dc ruby-oci8-VERSION.tar.gz | tar xvf -
     cd ruby-oci8-VERSION
     nmake
     nmake install
 
-[rubyforge]: http://rubyforge.org/frs/?group_id=256
+[download page]: https://bintray.com/kubo/generic/ruby-oci8

data/docs/report-installation-issue.md

@@ -4,7 +4,7 @@ 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.
 
-If it is a new one, post the following information to [github][] or [rubyforge][].
+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

data/ext/oci8/extconf.rb

@@ -156,11 +156,12 @@ when 'ruby'
   #    1.9.3      |   1.9.1
   # --------------+--------------
   #    2.0.0      |   2.0.0
-  #    2.0.1      |   2.0.1  (See: [ruby-core:49578])
+  # --------------+--------------
+  #    2.1.0      |   2.1.0
   #     ...       |    ...
   #
-  # Note: The ruby ABI version is same with RbConfig::CONFIG['ruby_version']
-  # if it wasn't explicitly changed by the configure option --with-ruby-version.
+  # The ABI version of ruby 2.1.1 will be 2.1.0.
+  # See "ABI Compatibility" in <URL:http://www.ruby-lang.org/en/news/2013/12/21/semantic-versioning-after-2-1-0/>.
   #
   case RUBY_VERSION
   when /^1\.9\.0/
@@ -170,7 +171,7 @@ when 'ruby'
   when /^1\.8/
     so_basename += '18'
   else
-    so_basename += RUBY_VERSION.gsub(/\W/, '')
+    so_basename += RUBY_VERSION.gsub(/(\d+)\.(\d+).(.*)/, '\1\20')
   end
 when 'rbx'
   so_basename += 'rbx'

data/ext/oci8/metadata.c

@@ -14,6 +14,7 @@ static VALUE mOCI8Metadata;
 VALUE cOCI8MetadataBase;
 static VALUE ptype_to_class;
 static VALUE class_to_ptype;
+static ID id_at_obj_link;
 
 typedef struct {
     oci8_base_t base;
@@ -175,11 +176,26 @@ static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype,
  */
 static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_public)
 {
+    char *str;
+    size_t idx, len;
+    VALUE metadata;
+    VALUE obj_link = Qnil;
+
     OCI8SafeStringValue(name);
     if (RSTRING_LEN(name) == 0) {
         rb_raise(rb_eArgError, "empty string is set.");
     }
-    return oci8_do_describe(self, RSTRING_PTR(name), RSTRING_LEN(name), OCI_OTYPE_NAME, klass, check_public);
+    str = RSTRING_PTR(name);
+    len = RSTRING_LEN(name);
+    for (idx = 0; idx < len; idx++) {
+        if (str[idx] == '@') {
+            obj_link = rb_enc_str_new(str + idx + 1, len - idx - 1, oci8_encoding);
+            break;
+        }
+    }
+    metadata = oci8_do_describe(self, str, len, OCI_OTYPE_NAME, klass, check_public);
+    rb_ivar_set(metadata, id_at_obj_link, obj_link);
+    return metadata;
 }
 
 static VALUE metadata_get_type_metadata(VALUE self, VALUE klass)
@@ -230,6 +246,7 @@ void Init_oci8_metadata(VALUE cOCI8)
     class_to_ptype = rb_hash_new();
     rb_global_variable(&ptype_to_class);
     rb_global_variable(&class_to_ptype);
+    id_at_obj_link = rb_intern("@obj_link");
 
     rb_define_singleton_method(cOCI8MetadataBase, "register_ptype", metadata_s_register_ptype, 1);
     rb_define_private_method(cOCI8MetadataBase, "__param", metadata_get_param, 1);

data/ext/oci8/oci8.h

@@ -152,6 +152,7 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
 #ifndef HAVE_TYPE_RB_ENCODING
 /* ruby 1.8, rubinuis 1.2 */
 #define rb_enc_associate(str, enc) do {} while(0)
+#define rb_enc_str_new(str, len, enc) rb_str_new((str), (len))
 #define rb_enc_str_buf_cat(str, ptr, len, enc) rb_str_buf_cat((str), (ptr), (len))
 #define rb_external_str_new_with_enc(ptr, len, enc) rb_tainted_str_new((ptr), (len))
 #define rb_locale_str_new_cstr(ptr)  rb_str_new2(ptr)

data/ext/oci8/oraconf.rb

@@ -334,8 +334,8 @@ Backtrace:
   #{$!.backtrace.join("\n  ")}
 ---------------------------------------------------
 See:
- * http://ruby-oci8.rubyforge.org/en/file.install-full-client.html for Oracle full client
- * http://ruby-oci8.rubyforge.org/en/file.install-instant-client.html for Oracle instant client
+ * http://rubydoc.info/gems/ruby-oci8/file/docs/install-full-client.md for Oracle full client
+ * http://rubydoc.info/gems/ruby-oci8/file/docs/install-instant-client.md for Oracle instant client
  * http://ruby-oci8.rubyforge.org/en/file.report-installation-issue.html to report an issue.
 
 EOS

data/lib/oci8.rb.in

@@ -43,11 +43,12 @@ when 'ruby'
   #    1.9.3      |   1.9.1
   # --------------+--------------
   #    2.0.0      |   2.0.0
-  #    2.0.1      |   2.0.1  (See: [ruby-core:49578])
+  # --------------+--------------
+  #    2.1.0      |   2.1.0
   #     ...       |    ...
   #
-  # Note: The ruby ABI version is same with RbConfig::CONFIG['ruby_version']
-  # if it wasn't explicitly changed by the configure option --with-ruby-version.
+  # The ABI version of ruby 2.1.1 will be 2.1.0.
+  # See "ABI Compatibility" in <URL:http://www.ruby-lang.org/en/news/2013/12/21/semantic-versioning-after-2-1-0/>.
   #
   case RUBY_VERSION
   when /^1\.9\.0/
@@ -57,7 +58,7 @@ when 'ruby'
   when /^1\.8/
     so_basename += '18'
   else
-    so_basename += RUBY_VERSION.gsub(/\W/, '')
+    so_basename += RUBY_VERSION.gsub(/(\d+)\.(\d+).(.*)/, '\1\20')
   end
 when 'rbx'
   so_basename += 'rbx'

data/lib/oci8/metadata.rb

@@ -89,6 +89,15 @@ class OCI8
       #  attr_get_oradate(OCI_ATTR_TIMESTAMP)
       #end
 
+      # Returns the database link name if the object is at the remote host.
+      # Note that this is available only when the object is returned by OCI8#describe_* methods.
+      #
+      # @return [String or nil] database link name
+      # @since 2.1.7
+      def obj_link
+        @obj_link
+      end
+
       # @private
       def inspect
         "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name}>"
@@ -2066,6 +2075,9 @@ class OCI8
       __describe(table_name, OCI8::Metadata::Table, false)
     else
       # check tables, views, synonyms and public synonyms.
+
+      # follow synonyms up to 20 times to prevent infinite loop
+      # caused by recursive synonyms.
       recursive_level = 20
       recursive_level.times do
         metadata = __describe(table_name, OCI8::Metadata::Unknown, true)
@@ -2074,6 +2086,11 @@ class OCI8
           return metadata
         when OCI8::Metadata::Synonym
           table_name = metadata.translated_name
+          if metadata.obj_link and metadata.link.nil?
+            # table_name is a synonym in a remote database for an object in the
+            # remote database itself.
+            table_name = "#{table_name}@#{metadata.obj_link}"
+          end
         else
           raise OCIError.new(4043, table_name) # ORA-04043: object %s does not exist
         end

data/ruby-oci8.gemspec

@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
   s.version = File.read('VERSION').strip
   s.summary = 'Ruby interface for Oracle using OCI8 API'
   s.email = 'kubo@jiubao.org'
-  s.homepage = 'http://ruby-oci8.rubyforge.org'
+  s.homepage = 'https://github.com/kubo/ruby-oci8/'
   s.rubyforge_project = 'ruby-oci8'
   s.description = <<EOS
 ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8i, Oracle9i, Oracle10g, Oracle11g and Oracle Instant Client.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 6
-  version: 2.1.6
+  - 7
+  version: 2.1.7
 platform: ruby
 authors: 
 - Kubo Takehiro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-29 00:00:00 +09:00
+date: 2014-02-02 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -121,7 +121,7 @@ files:
 - test/test_oranumber.rb
 - test/test_rowid.rb
 has_rdoc: true
-homepage: http://ruby-oci8.rubyforge.org
+homepage: https://github.com/kubo/ruby-oci8/
 licenses: 
 - 2-clause BSD-style license
 post_install_message: