ruby-oci8 2.1.2 → 2.1.3

data/.yardopts

@@ -4,8 +4,11 @@
 --exclude ext/oci8/oraconf.rb
 --exclude lib/oci8/compat.rb
 --exclude lib/dbd
+--hide-void-return
 -
 NEWS
+COPYING
+COPYING_old
 docs/install-full-client.md
 docs/install-instant-client.md
 docs/install-binary-package.md

data/COPYING

@@ -0,0 +1,30 @@
+# @markup pre
+
+License from ruby-oci8 2.1.3
+
+--- 
+Copyright 2002-2012 Kubo Takehiro <kubo@jiubao.org>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of the authors.

data/COPYING_old

@@ -0,0 +1,64 @@
+# @markup pre
+
+License until ruby-oci8 2.1.2
+
+The license of ruby-oci8 was changed to 2-clause BSD license by using the following
+2.d clause.
+
+--- 
+Ruby-oci8 is copyrighted free software by Kubo Takehiro <kubo@jiubao.org>.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+          modifications to Usenet or an equivalent medium, or by allowing
+          the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+          the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/ChangeLog

@@ -1,3 +1,118 @@
+2012-11-11  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c: use OCILobLocatorAssign_nb (non-blocking version)
+	    instead of OCILobLocatorAssign (blocking version).
+
+2012-11-11  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.1.3 and 2.1.2
+	* VERSION: change the version to 2.1.3.
+	* dist-files: append new files.
+	* ruby-oci8.gemspec: declare license in the gem.
+
+2012-11-11  KUBO Takehiro  <kubo@jiubao.org>
+	* Makefile: add doc and copy-doc targets to generate document by yard command.
+	* ext/oci8/oci8.c, ext/oci8/oci8.h, ext/oci8/oci8lib.c: change
+	    protoptype definition of Init_oci8 for yard command to parse it.
+	* ext/oci8/encoding.c, ext/oci8/oci8.c, ext/oci8/ocinumber.c,
+	  lib/oci8.rb.in, lib/oci8/connection_pool.rb, lib/oci8/datetime.rb,
+	  lib/oci8/encoding-init.rb, lib/oci8/metadata.rb, lib/oci8/object.rb,
+	  lib/oci8/oci8.rb: change comments for yard command.
+
+2012-11-11  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.h: update RB_GC_GUARD as ruby 1.9.2 defines.
+	* test/test_break.rb: fix tests for rubinius 1.2.4 and 2.0.0.
+
+2012-11-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: fix compilation errors when ruby version is 1.8.x.
+	* ext/oci8/ocinumber.c: Don't use rb_Rational() when rbx-2.0.testing
+	    runs with ruby 1.8 mode.
+	* lib/oci8/datetime.rb: fix #<NoMethodError: undefined method `timezone' for Time:Class>
+	    when ruby is less than 1.9.2 and an object type's time attribute
+	    is accessed.
+	* test/config.rb, test/test_oci8.rb: for ruby 1.8.x.
+
+2012-10-28  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb: Use rb_thread_call_without_gvl only when
+	    ruby/thread.h exists. rb_thread_call_without_gvl is an internal
+	    function in ruby 1.9.2 and 1.9.3.
+	* ext/oci8/oci8lib.c: fix compilation errors when ruby <= 1.9.1.
+	* setup.rb: fix uninitialized constant Config (NameError) on ruby 1.8.7.
+
+2012-10-28  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.c, ext/oci8/oci8.h, ext/oci8/oci8lib.c:
+	    Fix SEGV when a temporary LOB is GCed while another LOB is read.
+	    (github issue #20 reported by techsplicer)
+
+2012-10-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.c.tmpl, ext/oci8/connection_pool.c, ext/oci8/env.c,
+	  ext/oci8/extconf.rb, ext/oci8/oci8.c, ext/oci8/oci8.h, ext/oci8/oci8lib.c,
+	  ext/oci8/thread_util.c, ext/oci8/thread_util.h:
+	    replace rb_thread_blocking_region(), which is deprecated in ruby 2.0.0,
+	    with rb_thread_call_without_gvl() and rename oci8_blocking_region()
+	    to oci8_call_without_gvl().
+	* lib/oci8.rb.in: Ruby 2.0.0-dev's API version is changed to 2.0.0.
+	* setup.rb: use RbConfig instead of Config for ruby 2.0.0-dev.
+
+2012-08-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/stmt.c, lib/oci8/cursor.rb: revise yard comment.
+
+2012-08-11  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/stmt.c, lib/oci8/cursor.rb: refactor OCI8::Cursor to simplify
+	    C code.
+	* ext/oci8/bind.c: add a private function OCI8::BindType::Base#get_data
+	    and #set_data.
+	* ext/oci8/attr.c, ext/oci8/oci8.h, ext/oci8/oci8lib.c: delete
+	    unused functions and a unused variable.
+
+2012-08-11  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in, lib/oci8/cursor.rb, lib/oci8/oci8.rb:
+	    move OCI8::Cursor from lib/oci8/oci8.rb to lib/oci8/cursor.rb.
+
+2012-08-05  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/object.rb: Change the ruby type which corresponds to
+	    Oracle object type's DATE field from DateTime to Time.
+	* test/setup_test_object.sql, test/test_object.rb:
+	    Fix github issue #17 reported by Yasuo Honda.
+
+2012-07-31  KUBO Takehiro  <kubo@jiubao.org>
+	* test/config.rb, test/test_datetime.rb: refactor test code by adding
+	    global functions convert_to_time() and convert_to_datetime(),
+	    which will be used by test_object.rb later.
+
+2012-07-28  KUBO Takehiro  <kubo@jiubao.org>
+	* test/test_metadata.rb: fix a sequence test failure on Oracle 11gR2.
+	    Fix github issue #18 reported by Yasuo Honda.
+
+2012-07-28  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb, test/test_oci8.rb: add OCI8::Cursor#statement.
+	   See github issue #12 requested by timon.
+
+2012-05-25  KUBO Takehiro  <kubo@jiubao.org>
+	* test/test_clob.rb: speed up clob tests 29 times.
+
+2012-05-25  KUBO Takehiro  <kubo@jiubao.org>
+	* test/setup_test_object.sql, test/test_all.rb, test/test_object.rb:
+	   Add tests of the previous commit.
+
+2012-05-25  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c: Merge pull request #13 from timon/temp_lob at github.
+	    If 's' is a temporary lob, use OCILobLocatorAssign instead.
+
+2012-05-20  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c, test/test_oci8.rb: add OCI8's class variables:
+	    @@environment_handle and @@process_handle.
+
+2012-05-20  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocihandle.c, lib/oci8/metadata.rb, test/test_metadata.rb:
+	    fix methods of OCI8::Metadata::Sequence and add testcases for them.
+
+2012-05-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: refactor code which generates the
+	    C extention name.
+
+2012-05-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c, lib/oci8/oci8.rb: delete private methods OCI8#server_handle
+	    and OCI8#session_handle and use @server_handle and @session_handle instead.
+
 2012-04-28  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.1.2 and 2.1.1
 	* VERSION: change the version to 2.1.2.

data/Makefile

@@ -1,6 +1,5 @@
 VERSION = `cat VERSION`
 RUBY = ruby -w
-RDOC = rdoc
 
 all: build
 
@@ -29,10 +28,15 @@ format_c_source:
 	astyle --options=none --style=linux --indent=spaces=4 --brackets=linux --suffix=none ext/oci8/*.[ch]
 
 # internal use only
-.PHONY: rdoc run-rdoc
+.PHONY: dist dist-check doc copy-doc
 
-rdoc:
-	TZ= $(RDOC) -o rdoc -c us-ascii --threads=1 -W http://ruby-oci8.rubyforge.org/svn/trunk/ruby-oci8/ ext/oci8 lib
+doc:
+	rm -rf doc
+	TZ= yard
+	echo DirectoryIndex frames.html > doc/.htaccess
+
+copy-doc: doc
+	rsync -avz doc/ rubyforge.org:/var/www/gforge-projects/ruby-oci8/en
 
 dist:
 	-rm -rf ruby-oci8-$(VERSION)

data/NEWS

@@ -1,5 +1,63 @@
 # @markup markdown
 
+2.1.3
+=====
+
+New Features
+------------
+
+### {OCI8::Cursor#statement}
+
+It returns the text of the SQL statement prepared in the cursor.
+
+    cursor = conn.parse("select * from country where country_code = 'ja'")
+    cursor.statement # => "select * from country where country_code = 'ja'"
+
+See: [github issue #16](https://github.com/kubo/ruby-oci8/issues/16)
+
+Specification changes
+---------------------
+
+### License was changed to 2-clause BSD-style license.
+
+The former license was same with old ruby (<= 1.9.2) license.
+
+### Oracle object type's DATE field type
+
+Ruby-oci8 had returned a DateTime object when Oracle object type's DATE
+field type was accessed. Now it returns a Time object.
+
+Fixed Issues
+------------
+
+-   Fix to work with procedures and functions that return temporary lobs.
+    See: [github issue #13](https://github.com/kubo/ruby-oci8/issues/13)
+
+    (contributed by timon)
+
+-   Fix Oracle object type's DATE field tests.
+    See: [github issue #17](https://github.com/kubo/ruby-oci8/issues/17)
+
+    (reported by Yasuo Honda)
+
+-   Fix a sequence test failure on Oracle 11gR2.
+    See: [github issue #18](https://github.com/kubo/ruby-oci8/issues/18)
+
+    (reported by Yasuo Honda)
+
+-   Include COPYING files.
+    See: [github issue #19](https://github.com/kubo/ruby-oci8/issues/19)
+
+    (requested by Johannes Weberhofer)
+
+-   Fix SEGV when a temporary LOB is GCed while another LOB is read.
+    See: [github issue #20](https://github.com/kubo/ruby-oci8/issues/20)
+
+    (reported by techsplicer)
+
+-   Fix #<NoMethodError: undefined method `timezone' for Time:Class>
+    when ruby is less than 1.9.2 and an object type's time attribute is accessed.
+
 2.1.2
 =====
 
@@ -10,6 +68,7 @@ Specification changes
 
 This is workaround about a SIGSEGV issue.
 See: [oracle enhanced issue #162](https://github.com/rsim/oracle-enhanced/issues/162)
+
 Fixed Issues
 ------------
 
@@ -254,7 +313,7 @@ Fixed issues
     (reported by Hugo L. Borges)
 
 -   Fix a bug that a string is bound to RAW.
-    Its encoding had been convertd to {OCI.encoding} incorrectly.
+    Its encoding had been convertd to {OCI8.encoding} incorrectly.
 
 -   Fix memory leaks when temporary lobs are used.
 

data/README.md

@@ -7,8 +7,6 @@ Instant Client.
 
 If you need to use Oracle 8, use ruby-oci8 2.0.6.
 
-As for Oracle7, use Oracle7 Module for Ruby by Yoshida Masato.
-
 What's new
 ==========
 
@@ -23,9 +21,10 @@ 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`.
 
-Installation
-============
+Documantation
+=============
 
+* [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}
@@ -36,3 +35,9 @@ 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
+=======
+
+* {file:COPYING 2-clause BSD-style license} from ruby-oci8 2.1.3
+* {file:COPYING_old old Ruby license} until 2.1.2

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.1.3

data/dist-files

@@ -1,4 +1,6 @@
 .yardopts
+COPYING
+COPYING_old
 ChangeLog
 Makefile
 NEWS
@@ -52,6 +54,7 @@ lib/oci8/.document
 lib/oci8/bindtype.rb
 lib/oci8/compat.rb
 lib/oci8/connection_pool.rb
+lib/oci8/cursor.rb
 lib/oci8/datetime.rb
 lib/oci8/encoding-init.rb
 lib/oci8/encoding.yml
@@ -63,6 +66,7 @@ lib/oci8/oracle_version.rb
 lib/oci8/properties.rb
 test/README
 test/config.rb
+test/setup_test_object.sql
 test/test_all.rb
 test/test_appinfo.rb
 test/test_array_dml.rb
@@ -79,6 +83,7 @@ test/test_dbi.rb
 test/test_dbi_clob.rb
 test/test_error.rb
 test/test_metadata.rb
+test/test_object.rb
 test/test_oci8.rb
 test/test_oracle_version.rb
 test/test_oradate.rb

data/ext/oci8/apiwrap.c.tmpl

@@ -4,7 +4,7 @@
 %>
 #define API_WRAP_C 1
 #include "apiwrap.h"
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef NATIVE_THREAD_WITH_GVL
 #define BLOCKING_FUNCTION_EPILOGUE(svcctx) do { (svcctx)->executing_thread = Qnil; } while (0)
 #else
 #define BLOCKING_FUNCTION_EPILOGUE(svcctx) do { } while (0)
@@ -54,7 +54,7 @@ int oci8_have_<%=f.name%>_nb;
 #endif
 
 #if defined RUNTIME_API_CHECK || ORACLE_CLIENT_VERSION >= <%=f.version_num%>
-static VALUE oci8_<%=f.name%>_cb(void *user_data)
+static void *oci8_<%=f.name%>_cb(void *user_data)
 {
     oci8_<%=f.name%>_data_t *data = (oci8_<%=f.name%>_data_t *)user_data;
 <% if f.ret == 'void'
@@ -64,10 +64,10 @@ static VALUE oci8_<%=f.name%>_cb(void *user_data)
 <% end %>
 <% if f.ret == 'sword'
 %>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return (VALUE)data->rv;
+    return (void*)(VALUE)data->rv;
 <% else
 %>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return (VALUE)0;
+    return NULL;
 <% end %>
 }
 #else
@@ -82,7 +82,7 @@ static VALUE oci8_<%=f.name%>_cb(void *user_data)
 <% f.args.each do |a|
 %>        data.<%=a.name%> = <%=a.name%>;
 <% end
-%>        oci8_blocking_region(svcctx, oci8_<%=f.name%>_cb, &data);
+%>        oci8_call_without_gvl(svcctx, oci8_<%=f.name%>_cb, &data);
 <%   if f.ret != 'void'
 %>        return data.rv;
 <% end

data/ext/oci8/attr.c

@@ -2,19 +2,10 @@
 /*
  * attr.c
  *
- * Copyright (C) 2002-2007 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2012 KUBO Takehiro <kubo@jiubao.org>
  */
 #include "oci8.h"
 
-VALUE oci8_get_sb1_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
-{
-    sb1 val;
-
-    chker3(OCIAttrGet(base->hp.ptr, base->type, &val, NULL, attrtype, oci8_errhp),
-           base, stmtp);
-    return INT2FIX(val);
-}
-
 VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
 {
     ub2 val;
@@ -24,38 +15,6 @@ VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
     return INT2FIX(val);
 }
 
-VALUE oci8_get_sb2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
-{
-    sb2 val;
-
-    chker3(OCIAttrGet(base->hp.ptr, base->type, &val, NULL, attrtype, oci8_errhp),
-           base, stmtp);
-    return INT2FIX(val);
-}
-
-VALUE oci8_get_ub4_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
-{
-    ub4 val;
-
-    chker3(OCIAttrGet(base->hp.ptr, base->type, &val, NULL, attrtype, oci8_errhp),
-           base, stmtp);
-#if SIZEOF_LONG > 4
-    return LONG2FIX(val);
-#else
-    return ULONG2NUM(val);
-#endif
-}
-
-VALUE oci8_get_string_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp)
-{
-    text *val;
-    ub4 size;
-
-    chker3(OCIAttrGet(base->hp.ptr, base->type, &val, &size, attrtype, oci8_errhp),
-           base, stmtp);
-    return rb_external_str_new_with_enc(TO_CHARPTR(val), size, oci8_encoding);
-}
-
 #define MAX_ROWID_LEN 128
 
 typedef struct {