ruby-oci8 2.0.2 → 2.0.3

data/ChangeLog

@@ -1,3 +1,124 @@
+2009-10-21  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.0.2 and 2.0.3.
+	* VERSION, Makefile: change the version to 2.0.3.
+	* ext/oci8/oci8.c: fix typo.
+	* ext/oci8/apiwrap.yml: add OCIIntervalFromText() prototype.
+
+2009-10-18  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocidatetime.c: Add workarounds for Oracle 9.2.0.1.
+	* lib/oci8/datetime.rb: Change the unit of OCI8::BindType::IntervalDS
+	    from day to second. Add OCI8::BindType::IntervalDS.unit and
+	    OCI8::BindType::IntervalDS.unit=.
+	* test/test_datetime.rb: Fix tests for the above changes.
+
+2009-10-17  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: Add a workaround for Oracle 9.2.0.1 when clearing
+	    a client identifier.
+	* ext/oci8/oci8lib.c: Fix a segv when canceling a non-blocking
+	    execution.
+	* test_appinfo.rb: Fix temporarily to prevent a segmentation fault
+	    under Oracle 9.2.0.1.
+	* test/test_oci8.rb: Fix temporarily to prevent a segmentation fault
+	    under Oracle 9.2.0.1. Fix for BigDecimal bundled in ruby 1.8.5.
+	* test/test_oranumber.rb: Fix for Oracle 9.2. Comparing float values
+	    by <=> is too sensitive to use it in tests.
+
+2009-10-06  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocinumber.c: Add a global function OraNumber(obj) as a
+	    shortcut of OraNumber.new(obj) as Rational and BigDecimal do.
+	    Changes the return type of the four rules of arithmetic;
+	    addition, subtraction, multiplication and division. It was
+	    OraNumber, but now it depends on the operand.
+	* lib/oci8/bindtype.rb: Add OCI8::BindType::BigDecimal and
+	    OCI8::BindType::Rational. Change the default data type for
+	    number column which fit neither Integer nor Float from
+	    OraNumber to BigDecimal.
+	* lib/oci8/oci8.rb: Fix for OCI8::BindType::Mapping to accept
+	    a class name instead of the class object to support
+	    OCI8::BindType::BigDecimal and OCI8::BindType::Rational without
+	    requiring 'bigdecimal' and 'rational'.
+	* spec/oranumber_spec.rb: Add a spec file for OraNumber arithmetic.
+	* test/test_oci8.rb: Add tests for OCI8::BindType::BigDecimal and
+	    OCI8::BindType::Rational.
+
+2009-10-04  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: Add constants missing in Oracle client prior to 10g.
+	* ext/oci8/oraconf.rb:
+	    1. Fix for ruby 1.8.5 with Oracle 8.x which needs some object
+	       files to link with.
+	       (reported by Jayson Cena)
+	    2. Revise the error message under the sudo environemnt.
+	    3. Print not only error message but also the error backtrace when
+	       oraconf.rb fails.
+	* lib/oci8/object.rb: Fix to accept nil attribute in object type's
+	    constructors. This works only for simple data types such as number,
+	    string. But it doesn't for complex types such as object types.
+	    (requested by Remi Gagnon)
+	* spec/object_type_spec.rb: Add a test for object type's constructors.
+
+2009-09-22  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/.document, lib/oci8/datetime.rb: 1. Add
+	    OCI8::BindType.default_timezone and OCI8::BindType.default_timezone=.
+	    2. Change the logic to convert to Time and DateTime to adapt DST.
+	    3. Use new features of Time class in ruby 1.9.2 if they are available.
+	    4. Add rdoc comments.
+	* spec/fetch_datetime8_spec.rb, spec/fetch_datetime_spec.rb,
+	  spec/fetch_time8_spec.rb, spec/fetch_time_spec.rb,
+	  spec/spec_helper.rb: Add tests for OCI8::BindType::DateTime and
+	    OCI8::BindType::Time.
+
+2009-09-13  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.h, test/test_clob.rb: Change
+	    OCI8::LOB#write to accept an object which is not a String and
+	    doesn't respond to 'to_str' as IO#write does.
+	    (requested by Christopher Jones)
+
+2009-09-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: Fixed for ruby 1.9.2 preview1.
+	    (pointed by Raimonds Simanovskis)
+
+2009-09-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Fixed to compile for AIX instant clients.
+	    (reported by Kazuya Teramoto)
+
+2009-06-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: Change the initial polling interval of
+	    non-blocking mode for ruby 1.8 from 100 msec to 10 msec, which
+	    is same with ruby-oci8 1.0.
+	* ext/oci8/oci8.c: Change the default setting of non-blocking mode
+	    for ruby 1.9 to true. Revise rdoc comments.
+
+2009-06-07  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: revise rdoc comments.
+
+2009-06-05  KUBO Takehiro  <kubo@jiubao.org>
+	* Makefile: check rdoc version when making rdoc documentation.
+	    The rdoc version must be 2.4.
+	* ext/oci8/.document, ext/oci8/oci8.c, lib/.document,
+	  lib/oci8/.document, lib/oci8/oci8.rb: fix rdoc comments a bit.
+
+2009-05-24  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/object.c, lib/oci8/datetime.rb, lib/oci8/object.rb:
+	    add DATE datatype support in object types.
+
+2009-05-19  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/bind.c: delete OCI8::BindType::Fixnum.
+	* lib/oci8/compat.rb: add OCI8::BindType::Fixnum as an alias
+	    of OCI8::BindType::Integer.
+	* ext/oci8/extconf.rb: change extconf.rb's argument value of
+	    '--with-oracle-version' to accept dotted version such as
+	    '9.2.0.'
+	* ext/oci8/oraconf.rb: When extconf.rb fails and it is run
+	    by sudo command, change the error message to notice that
+	    'sudo' may unset environment variables.
+
+2009-05-18  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: revise rdoc comments for OCI8#ping and
+	    OCI8#client_identifier=. Add OCI8#module=, OCI8#action= and
+	    OCI8#client_info.
+	* test/test_appinfo.rb: add test cases for OCI8#module=,
+	    OCI8#action= and OCI8#client_info.
+
 2009-05-17  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.0.1 and 2.0.2.
 	* VERSION: change version to 2.0.2.

data/Makefile

@@ -1,5 +1,6 @@
 VERSION = `cat VERSION`
 RUBY = ruby -w
+RDOC = rdoc
 
 all: build
 
@@ -30,10 +31,16 @@ format_c_source:
 	astyle --options=none --style=linux --indent=spaces=4 --brackets=linux --suffix=none ext/oci8/*.[ch]
 
 # internal use only
-.PHONY: rdoc
+.PHONY: rdoc check-rdoc-version run-rdoc
 
-rdoc:
-	$(RUBY) custom-rdoc.rb -o rdoc -U README ext/oci8 lib
+rdoc: check-rdoc-version run-rdoc
+
+check-rdoc-version:
+	@echo check rdoc version
+	@expr match "`$(RDOC) --version`" '^rdoc 2\.4' > /dev/null || (echo 'rdoc version is not 2.4.'; exit 1)
+
+run-rdoc:
+	TZ= $(RDOC) -o rdoc -c us-ascii --threads=1 -W http://ruby-oci8.rubyforge.org/svn/trunk/ruby-oci8/ ext/oci8 lib
 
 dist:
 	-rm -rf ruby-oci8-$(VERSION)
@@ -52,7 +59,7 @@ dist-check: dist
 #
 RUBY_18 = c:\ruby
 RUBY_191 = c:\ruby-1.9.1
-GEMPKG = ruby-oci8-2.0.2-x86-mswin32-60.gem
+GEMPKG = ruby-oci8-2.0.3-x86-mswin32-60.gem
 
 ext\oci8\oci8lib_18.so:
 	$(RUBY_18)\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby18')"

data/NEWS

@@ -1,3 +1,129 @@
+2.0.3:
+
+* Imcompatible Changes
+
+  - Number column in a SQL statement
+
+    Changes the default data type for number column which fit neither
+    Integer nor Float from OraNumber to BigDecimal.
+
+      conn.exec("select 1.0 from dual") do |row|
+        p row[0] # => BigDecimal("1") if the ruby-oci8 version is 2.0.3.
+                 # => OraNumber(1) if the version is 2.0.2.
+      end
+
+  - Priority of OraNumber within numerical types
+
+    The return types of basic arithmetic operations with other numerical
+    types are changed.
+
+    2.0.3:
+      OraNumber + Integer    => OraNumber  (OraNumber wins.)
+      OraNumber + Float      => Float      (OraNumber loses.)
+      OraNumber + Rational   => Rational   (OraNumber loses.)
+      OraNumber + BigDecimal => BigDecimal (OraNumber loses.)
+
+    2.0.2:
+      OraNumber + Integer    => OraNumber  (OraNumber wins always.)
+      OraNumber + Float      => OraNumber
+      OraNumber + Rational   => OraNumber
+      OraNumber + BigDecimal => OraNumber
+
+  - Interval day to second
+
+    The retrived value of Oracle data type "interval day to second"
+    was changed from the number of days as a Rational to the number
+    of seconds as a Float by default.
+    Use OCI8::BindType::IntervalDS.unit = :day to make it compatible
+    with the previous versions.
+
+      conn.exec("select to_dsinterval('0 00:00:01') from dual") do |row|
+        p row[0] # => 1.0 if the version is 2.0.3 and
+                 #    OCI8::BindType::IntervalDS.unit is :second.
+                 # => (1/86400) if the version is 2.0.3 and
+		 #    OCI8::BindType::IntervalDS.unit is :day or
+		 #    the version is 2.0.2.
+      end
+
+  - Date, timestamp, timestamp with time zone data types and ruby 1.9.2
+
+    These data types are retrived always as Time values when the
+    ruby version is 1.9.2 because the Time class is enhanced to
+    represent any time zone and is free from year 2038 problem.
+
+    Prior to ruby 1.9.2, if the time cannot be represented by
+    Unix time or the time zone is neither utc nor local, they are
+    retrived as DateTime values.
+
+  - Non-blocking mode and ruby 1.9
+
+    non-blocking mode is enabled by default when the ruby is 1.9.
+
+* New Features
+
+  - BigDecimal and Rational are availabe as bind values.
+
+  - New methods OCI8#module=, OCI8#action= and OCI8#client_info= are added.
+
+    These methods change the module name, the action name and the client_info
+    in the current session respectively.
+
+    After Oracle 10g client, these don't perform network round trips.
+    The change is reflected to the server by the next round trip such as
+    OCI8#exec, OCI8#ping, etc.
+
+    Prior to Oracle 10g client, these call PL/SQL functions such as
+    DBMS_APPLICATION_INFO.SET_MODULE, DBMS_APPLICATION_INFO.SET_ACTION,
+    and DBMS_APPLICATION_INFO.SET_CLIENT_INFO internally.
+    The change is reflected immediately by a network round trip.
+
+  - OCI8::BindType.default_timezone
+
+    The default time zone of Time or DateTime values.
+    This parameter is used only when
+    (1) date values are fetched and the Oracle client version is 8.x
+    or
+    (2) object types have date data type attributes.
+
+    Note that if the Oracle client version is 9i or upper, the time
+    zone is determined by the session time zone. The default value
+    is local time zone. You can change it to GMT by executing the
+    following SQL statement for each connection.
+
+       alter session set time_zone = '00:00'
+
+* Other specification changes
+
+  - Add a global function OraNumber(obj) as a shortcut of OraNumber.new(obj)
+    as Rational and BigDecimal do.
+
+  - Fix to accept nil attribute in object type's
+    constructors. This works only for simple data types such as number,
+    string. But it doesn't for complex types such as object types.
+    (requested by Remi Gagnon)
+
+  - add DATE datatype support in object types.
+
+  - Change OCI8::LOB#write to accept an object which is not a String and
+    doesn't respond to 'to_str' as IO#write does.
+    (requested by Christopher Jones)
+
+  - Change the initial polling interval of
+    non-blocking mode for ruby 1.8 from 100 msec to 10 msec, which
+    is same with ruby-oci8 1.0.
+
+* Fixed installation issues.
+
+  - Fix oraconf.rb for ruby 1.8.5 with Oracle 8.x which needs some object
+    files to link with.
+    (reported by Jayson Cena)
+
+  - Fix oraconf.rb for ruby 1.9.2 preview1.
+    (pointed by Raimonds Simanovskis)
+
+  - Fix oraconf.rb to compile for AIX instant clients.
+    (reported by Kazuya Teramoto)
+
 2.0.2:
 
 * add new methods

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/ext/oci8/.document

@@ -1 +1,16 @@
-*.c
+#attr.c
+#oci8lib.c
+#env.c
+
+oci8.c
+bind.c
+stmt.c
+encoding.c
+error.c
+metadata.c
+
+lob.c
+ocinumber.c
+ocidatetime.c
+oradate.c
+object.c

data/ext/oci8/apiwrap.yml

@@ -1076,6 +1076,15 @@ OCIDateTimeGetTime:
             - ub1 *ss
             - ub4 *fsec
 
+# round trip: 0 (not docmented. I guess.)
+OCIIntervalFromText:
+  :version: 900
+  :args:    - dvoid *hndl
+            - OCIError *err
+            - CONST OraText *inpstr
+            - size_t str_len
+            - OCIInterval *result
+
 # round trip: 0 (not docmented. I guess.)
 OCIDateTimeGetTimeZoneOffset:
   :version: 900

data/ext/oci8/attr.c

@@ -3,7 +3,7 @@
  * attr.c
  *
  * $Author: kubo $
- * $Date: 2009-05-17 22:07:16 +0900 (Sun, 17 May 2009) $
+ * $Date: 2009-10-21 22:50:01 +0900 (Wed, 21 Oct 2009) $
  *
  * Copyright (C) 2002-2007 KUBO Takehiro <kubo@jiubao.org>
  */

data/ext/oci8/bind.c

@@ -3,7 +3,7 @@
  * bind.c
  *
  * $Author: kubo $
- * $Date: 2009-05-17 22:07:16 +0900 (Sun, 17 May 2009) $
+ * $Date: 2009-10-21 22:50:01 +0900 (Wed, 21 Oct 2009) $
  *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  */
@@ -238,42 +238,6 @@ static const oci8_bind_class_t bind_long_raw_class = {
 };
 #endif /* USE_DYNAMIC_FETCH */
 
-/*
- * bind_fixnum
- */
-static VALUE bind_fixnum_get(oci8_bind_t *obind, void *data, void *null_struct)
-{
-    return LONG2NUM(*(long*)data);
-}
-
-static void bind_fixnum_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
-{
-    Check_Type(val, T_FIXNUM);
-    *(long*)data = FIX2LONG(val);
-}
-
-static void bind_fixnum_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
-{
-    obind->value_sz = sizeof(long);
-    obind->alloc_sz = sizeof(long);
-}
-
-static const oci8_bind_class_t bind_fixnum_class = {
-    {
-        NULL,
-        oci8_bind_free,
-        sizeof(oci8_bind_t)
-    },
-    bind_fixnum_get,
-    bind_fixnum_set,
-    bind_fixnum_init,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    SQLT_INT
-};
-
 /*
  * bind_float
  */
@@ -493,7 +457,6 @@ void Init_oci8_bind(VALUE klass)
     oci8_define_bind_class("Long", &bind_long_class);
     oci8_define_bind_class("LongRaw", &bind_long_raw_class);
 #endif /* USE_DYNAMIC_FETCH */
-    oci8_define_bind_class("Fixnum", &bind_fixnum_class);
     oci8_define_bind_class("Float", &bind_float_class);
     if (oracle_client_version >= ORAVER_10_1) {
         oci8_define_bind_class("BinaryDouble", &bind_binary_double_class);

data/ext/oci8/extconf.rb

@@ -11,6 +11,7 @@ end
 
 require File.dirname(__FILE__) + '/oraconf'
 require File.dirname(__FILE__) + '/apiwrap'
+require File.dirname(__FILE__) + '/../../lib/oci8/oracle_version.rb'
 
 RUBY_OCI8_VERSION = File.read("#{File.dirname(__FILE__)}/../../VERSION").chomp
 
@@ -70,7 +71,7 @@ have_type('OCICallbackLobWrite2', 'ociap.h')
 have_type('OCIAdmin*', 'ociap.h')
 
 if with_config('oracle-version')
-  oci_client_version = with_config('oracle-version').to_i
+  oci_client_version = OCI8::OracleVersion.new(with_config('oracle-version')).to_i
 else
   oci_client_version = oci_actual_client_version
 end
@@ -118,14 +119,12 @@ replace = {
 # make ruby script before running create_makefile.
 replace_keyword(File.dirname(__FILE__) + '/../../lib/oci8.rb.in', '../../lib/oci8.rb', replace)
 
-case RUBY_VERSION
-when /^1\.9\.1/
-  so_basename = "oci8lib_191"
-when /^1\.8/
-  so_basename = "oci8lib_18"
-else
-  raise 'unsupported ruby version: ' + RUBY_VERSION
-end
+# Config::CONFIG["ruby_version"] indicates the ruby API version.
+#  1.8   - ruby 1.8.x
+#  1.9.1 - ruby 1.9.1 and 1.9.2
+#  1.9.x - ruby 1.9.x future version which will break the API compatibility
+so_basename = "oci8lib_" + Config::CONFIG["ruby_version"].gsub(/\W/, '')
+
 $defs << "-DInit_oci8lib=Init_#{so_basename}"
 $defs << "-Doci8lib=#{so_basename}"
 

data/ext/oci8/lob.c

@@ -379,11 +379,13 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
     ub4 amt;
 
     lob_open(lob);
+    if (TYPE(data) != T_STRING) {
+        data = rb_obj_as_string(data);
+    }
     if (lob->lobtype == OCI_TEMP_CLOB) {
-        OCI8StringValue(data);
-    } else {
-        StringValue(data);
+        data = rb_str_export_to_enc(data, oci8_encoding);
     }
+    RB_GC_GUARD(data);
     amt = RSTRING_LEN(data);
     oci_lc(OCILobWrite_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, RSTRING_PTR(data), amt, OCI_ONE_PIECE, NULL, NULL, 0, lob->csfrm));
     lob->pos += amt;