ruby-oci8 2.1.2-x86-mingw32 → 2.1.3-x86-mingw32

data/ruby-oci8.gemspec

@@ -34,6 +34,7 @@ EOS
   s.has_rdoc = 'yard'
   s.authors = ['KUBO Takehiro']
   s.platform = gem_platform
+  s.license = '2-clause BSD-style license'
   files = File.read('dist-files').split("\n")
   if gem_platform == Gem::Platform::RUBY
     s.extensions << 'ext/oci8/extconf.rb'

data/setup.rb

@@ -99,6 +99,8 @@ else
   require 'rbconfig'
 end
 
+RbConfig = Config unless defined? RbConfig
+
 def multipackage_install?
   FileTest.directory?(File.dirname($0) + '/packages')
 end
@@ -106,7 +108,7 @@ end
 
 class ConfigTable
 
-  c = ::Config::CONFIG
+  c = ::RbConfig::CONFIG
 
   rubypath = c['bindir'] + '/' + c['ruby_install_name']
 
@@ -1217,7 +1219,7 @@ class Installer
         raise InstallError, "no ruby extention exists: 'ruby #{$0} setup' first"
   end
 
-  DLEXT = /\.#{ ::Config::CONFIG['DLEXT'] }\z/
+  DLEXT = /\.#{ ::RbConfig::CONFIG['DLEXT'] }\z/
 
   def _ruby_extentions(dir)
     Dir.open(dir) {|d|

data/test/config.rb

@@ -44,6 +44,70 @@ else
   $test_clob = true
 end
 
+begin
+  Time.new(2001, 1, 1, 0, 0, 0, '+00:00')
+  # ruby 1.9.2 or later
+  def convert_to_time(year, month, day, hour, minute, sec, subsec, timezone)
+    subsec ||= 0
+    if timezone
+      # with time zone
+      Time.new(year, month, day, hour, minute, sec + subsec, timezone)
+    else
+      # without time zone
+      Time.local(year, month, day, hour, minute, sec, subsec * 1000000)
+    end
+  end
+rescue
+  # ruby 1.9.1 or former
+  def convert_to_time(year, month, day, hour, minute, sec, subsec, timezone)
+    subsec ||= 0
+    if timezone
+      # with time zone
+      /([+-])(\d+):(\d+)/ =~ timezone
+      offset = ($1 + '1').to_i * ($2.to_i * 60 + $3.to_i)
+      if offset == 0
+        Time.utc(year, month, day, hour, minute, sec, subsec * 1000000)
+      else
+        tm = Time.local(year, month, day, hour, minute, sec, subsec * 1000000)
+        raise "Failed to convert #{str} to Time" if tm.utc_offset != offset * 60
+        tm
+      end
+    else
+      # without time zone
+      Time.local(year, month, day, hour, minute, sec, subsec * 1000000)
+    end
+  end
+end
+
+def convert_to_datetime(year, month, day, hour, minute, sec, subsec, timezone)
+  subsec ||= 0
+  utc_offset = if timezone
+                 # with time zone
+                 /([+-])(\d+):(\d+)/ =~ timezone
+                 ($1 + '1').to_i * ($2.to_i * 60 + $3.to_i) * 60
+               else
+                 Time.local(year, month, day, hour, minute, sec).utc_offset
+               end
+  begin
+    DateTime.civil(year, month, day, hour, minute, sec + subsec, utc_offset.to_r / 86400)
+  rescue ArgumentError
+    raise $! if $!.to_s != 'invalid date'
+    # for ruby 1.8.6.
+    # convert to a DateTime via a String as a workaround.
+    if utc_offset >= 0
+      sign = ?+
+    else
+      sign = ?-
+      utc_offset = - utc_offset;
+    end
+    tz_min = utc_offset / 60
+    tz_hour, tz_min = tz_min.divmod 60
+    time_str = format("%04d-%02d-%02dT%02d:%02d:%02d.%09d%c%02d:%02d",
+                      year, month, day, hour, minute, sec, (subsec * 1000_000_000).to_i, sign, tz_hour, tz_min)
+    ::DateTime.parse(time_str)
+  end
+end
+
 module Test
   module Unit
     class TestCase

data/test/setup_test_object.sql

@@ -0,0 +1,171 @@
+drop table rb_test_obj_tab1 purge
+/
+drop table rb_test_obj_tab2 purge
+/
+drop type rb_test_obj
+/
+drop type rb_test_obj_elem_ary_of_ary
+/
+drop type rb_test_obj_elem_array
+/
+drop type rb_test_obj_elem
+/
+create type rb_test_obj_elem as object (
+  x integer,
+  y integer
+)
+/
+create or replace type rb_test_int_array as array(50) of integer
+/
+create or replace type rb_test_flt_array as array(50) of float
+/
+create or replace type rb_test_num_array as array(50) of number(10,1)
+/
+create or replace type rb_test_bdbl_array as array(50) of binary_double
+/
+create or replace type rb_test_bflt_array as array(50) of binary_float
+/
+create or replace type rb_test_str_array as array(50) of varchar2(50)
+/
+create or replace type rb_test_raw_array as array(50) of raw(50)
+/
+create or replace type rb_test_obj_elem_array as array(50) of rb_test_obj_elem
+/
+create or replace type rb_test_obj_elem_ary_of_ary as array(50) of rb_test_obj_elem_array
+/
+--create or replace type rb_test_date_array as array(50) of date
+--/
+create type rb_test_obj as object (
+  int_val integer,
+  flt_val float,
+  num_val number(10,1),
+  bdbl_val binary_double,
+  bflt_val binary_float,
+  str_val varchar2(50),
+  raw_val raw(50),
+  clob_val clob,
+  nclob_val nclob,
+  blob_val blob,
+  obj_val rb_test_obj_elem,
+  int_array_val rb_test_int_array,
+  flt_array_val rb_test_flt_array,
+  num_array_val rb_test_num_array,
+  bdbl_array_val rb_test_bdbl_array,
+  bflt_array_val rb_test_bflt_array,
+  str_array_val rb_test_str_array,
+  raw_array_val rb_test_raw_array,
+  obj_array_val rb_test_obj_elem_array,
+  obj_ary_of_ary_val rb_test_obj_elem_ary_of_ary,
+  date_val date,
+--  date_array_val rb_test_date_array,
+
+  constructor function rb_test_obj(n number) return self as result,
+  static function test_object_version return integer,
+  static function class_func(n number) return rb_test_obj,
+  static procedure class_proc1(obj out rb_test_obj, n number),
+  static procedure class_proc2(obj in out rb_test_obj),
+  member function member_func return integer,
+  member procedure member_proc(n in integer)
+)
+/
+create or replace type body rb_test_obj is
+
+  constructor function rb_test_obj(n number) return self as result is
+    function to_test_date(n number) return date is
+    begin
+      return to_date(to_char(1990 + n, 'FM0000') ||
+                     to_char(mod(round(n) * 5, 12) + 1, 'FM00') ||
+                     to_char(mod(round(n) * 7, 27) + 1, 'FM00') ||
+                     to_char(mod(round(n) * 9, 24), 'FM00') ||
+                     to_char(mod(round(n) * 11, 60), 'FM00') ||
+                     to_char(mod(round(n) * 13, 60), 'FM00'), 'yyyymmddhh24miss');
+    end;
+  begin
+    self.int_val := n;
+    self.flt_val := n;
+    self.num_val := n;
+    self.bdbl_val := n;
+    self.bflt_val := n;
+    self.str_val := to_char(n);
+    self.raw_val := utl_raw.cast_to_raw(to_char(n));
+    self.clob_val := to_clob(n);
+    self.nclob_val := to_clob(n);
+    self.blob_val := to_blob(utl_raw.cast_to_raw(to_char(n)));
+    self.obj_val := rb_test_obj_elem(n, n + 1);
+    self.date_val := to_test_date(n);
+    if self.int_val != 1 then
+      self.int_array_val := rb_test_int_array(n, n + 1, n + 2);
+      self.flt_array_val := rb_test_flt_array(n, n + 1, n + 2);
+      self.num_array_val := rb_test_num_array(n, n + 1, n + 2);
+      self.bdbl_array_val := rb_test_bdbl_array(n, n + 1, n + 2);
+      self.bflt_array_val := rb_test_bflt_array(n, n + 1, n + 2);
+      self.str_array_val := rb_test_str_array(to_char(n), to_char(n + 1), to_char(n + 2));
+      self.raw_array_val := rb_test_raw_array(utl_raw.cast_to_raw(to_char(n)),
+                                              utl_raw.cast_to_raw(to_char(n + 1)),
+                                              utl_raw.cast_to_raw(to_char(n + 2)));
+      self.obj_array_val := rb_test_obj_elem_array(rb_test_obj_elem(n + 0, n + 1),
+                                                   rb_test_obj_elem(n + 1, n + 2),
+                                                   rb_test_obj_elem(n + 2, n + 3));
+      self.obj_ary_of_ary_val := rb_test_obj_elem_ary_of_ary(self.obj_array_val);
+--      self.date_array_val := rb_test_date_array(to_test_date(n),
+--                                                to_test_date(n + 1),
+--                                                to_test_date(n + 2));
+    end if;
+    return;
+  end;
+
+  static function test_object_version return integer is
+  begin
+    return 2;
+  end;
+
+  static function class_func(n number) return rb_test_obj is
+  begin
+    return rb_test_obj(n);
+  end;
+
+  static procedure class_proc1(obj out rb_test_obj, n number) is
+  begin
+    obj := rb_test_obj(n);
+  end;
+
+  static procedure class_proc2(obj in out rb_test_obj) is
+  begin
+    obj.int_val := obj.int_val + 1;
+  end;
+
+  member function member_func return integer is
+  begin
+    return int_val;
+  end;
+
+  member procedure member_proc(n in integer) is
+  begin
+    self.int_val := n;
+  end;
+end;
+/
+create table rb_test_obj_tab1 (
+  n number primary key,
+  obj rb_test_obj
+)
+/
+create table rb_test_obj_tab2 of rb_test_obj (
+  int_val primary key
+)
+/
+declare
+  n number := 0;
+  obj rb_test_obj;
+begin
+  loop
+    n := n + 1.2;
+    exit when n > 20;
+    obj := rb_test_obj(n);
+    insert into rb_test_obj_tab1 values (n, obj);
+    insert into rb_test_obj_tab2 values (obj);
+  end loop;
+end;
+/
+commit
+/

data/test/test_all.rb

@@ -24,6 +24,7 @@ require "#{srcdir}/test_appinfo"
 require "#{srcdir}/test_oracle_version"
 require "#{srcdir}/test_error"
 require "#{srcdir}/test_connection_pool"
+require "#{srcdir}/test_object"
 
 if OCI8.respond_to? :encoding
   require "#{srcdir}/test_encoding"

data/test/test_break.rb

@@ -62,7 +62,15 @@ class TestBreak < Test::Unit::TestCase
     expect = []
     expect[PLSQL_DONE] = TIME_IN_PLSQL
     expect[OCIBREAK]   = "Invalid status"
-    expect[SEND_BREAK] = TIME_IN_PLSQL + TIME_TO_BREAK
+    if defined? Rubinius and Rubinius::VERSION >= "2.0"
+      # Rubinius 2.0.0.
+      # DBMS_LOCK.SLEEP blocks ruby threads which try to call C-API.
+      expect[SEND_BREAK] = TIME_TO_BREAK
+    else
+      # MRI and Rubinius 1.2.4.
+      # DBMS_LOCK.SLEEP blocks all ruby threads.
+      expect[SEND_BREAK] = TIME_IN_PLSQL + TIME_TO_BREAK
+    end
     do_test_ocibreak(@conn, expect)
   end
 
@@ -91,7 +99,15 @@ class TestBreak < Test::Unit::TestCase
   def test_timeout
     @conn.non_blocking = true
     start_time = Time.now
-    assert_raise(Timeout::Error) do
+
+    if defined? Rubinius and Rubinius::VERSION < "2.0"
+      # Rubinius 1.2.4
+      expected = OCIBreak
+    else
+      # MRI and Rubinius 2.0.0
+      expected = Timeout::Error
+    end
+    assert_raise(expected) do
       Timeout.timeout(1) do
         @conn.exec("BEGIN DBMS_LOCK.SLEEP(5); END;")
       end

data/test/test_clob.rb

@@ -18,8 +18,8 @@ class TestCLob < Test::Unit::TestCase
     cursor = @conn.exec("SELECT content FROM test_table WHERE filename = :1 FOR UPDATE", filename)
     lob = cursor.fetch[0]
     open($lobfile) do |f|
-      while f.gets()
-        lob.write($_)
+      while s = f.read(1000)
+        lob.write(s)
       end
     end
     lob.close
@@ -33,8 +33,8 @@ class TestCLob < Test::Unit::TestCase
     lob = cursor.fetch[0]
     lob.sync = false
     open($lobfile) do |f|
-      while f.gets()
-        lob.write($_)
+      while s = f.read(1000)
+        lob.write(s)
       end
     end
     lob.flush

data/test/test_datetime.rb

@@ -13,59 +13,20 @@ class TestDateTime < Test::Unit::TestCase
     end
   end
 
-  @@time_new_accepts_timezone = begin
-                                  Time.new(2001, 1, 1, 0, 0, 0, '+00:00')
-                                  true
-                                rescue
-                                  false
-                                end
-
   def string_to_time(str)
-    /(\d+)-(\d+)-(\d+) ?(?:(\d+):(\d+):(\d+))?(?:\.(\d+))? ?(([+-])(\d+):(\d+))?/ =~ str
-    args = []
-    args << $1.to_i # year
-    args << $2.to_i # month
-    args << $3.to_i # day
-    args << $4.to_i if $4 # hour
-    args << $5.to_i if $5 # minute
-    if $8 and @@time_new_accepts_timezone
-      args << $6.to_i + $7.to_i.to_r / ('1' + '0' * ($7.length)).to_i
-      args << $8
-      Time.new(*args)
-    else
-      if $6
-        args << $6.to_i
-      end
-      if $7
-        args << $7.to_i.to_r * 1000000 / ('1' + '0' * ($7.length)).to_i
-      end
-      if $8
-        # with time zone
-        offset = ($9 + '1').to_i * ($10.to_i * 60 + $11.to_i)
-        if offset == 0
-          Time.utc(*args)
-        else
-          tm = Time.local(*args)
-          raise "Failed to convert #{str} to Time" if tm.utc_offset != offset * 60
-          tm
-        end
-      else
-        # without time zone
-        Time.local(*args)
-      end
+    /(\d+)-(\d+)-(\d+) ?(?:(\d+):(\d+):(\d+))?(?:\.(\d+))? ?([+-]\d+:\d+)?/ =~ str
+    if $7
+      subsec = $7.to_i.to_r / ('1' + '0' * ($7.length)).to_i
     end
-    #Time.local(*str.split(/[- :\.]/).collect do |n| n.to_i; end)
+    convert_to_time($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, subsec, $8)
   end
 
   def string_to_datetime(str)
-    /(\d+-\d+-\d+ ?(?:\d+:\d+:\d+)?(?:\.\d+)?) ?([+-]\d+:\d+)?/ =~ str
-    if $2
-      # with time zone
-      DateTime.parse(str)
-    else
-      tm = string_to_time(str)
-      DateTime.parse(str + timezone_string(*((tm.utc_offset / 60).divmod 60)))
+    /(\d+)-(\d+)-(\d+) ?(?:(\d+):(\d+):(\d+))?(?:\.(\d+))? ?([+-]\d+:\d+)?/ =~ str
+    if $7
+      subsec = $7.to_i.to_r / ('1' + '0' * ($7.length)).to_i
     end
+    convert_to_datetime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, subsec, $8)
   end
 
   def setup

data/test/test_metadata.rb

@@ -1406,4 +1406,82 @@ EOS
     drop_table('test_table')
   end # test_column_metadata
 
+  def assert_sequence(sequence_name, desc)
+    # defined in OCI8::Metadata::Base
+    assert_object_id(sequence_name, desc.obj_id)
+    assert_equal(sequence_name, desc.obj_name, 'obj_name')
+    assert_equal(@conn.username, desc.obj_schema, 'obj_schema')
+    # defined in OCI8::Metadata::Sequence
+    assert_object_id(sequence_name, desc.objid)
+    min, max, incr, cache, order = @conn.select_one(<<EOS, sequence_name)
+select min_value, max_value, increment_by, cache_size, order_flag
+  from user_sequences
+ where sequence_name = :1
+EOS
+    min = min.to_i
+    max = max.to_i
+    incr = incr.to_i
+    cache = cache.to_i
+    order = order == 'Y'
+    currval = @conn.select_one("select cast(#{sequence_name}.currval as integer) from dual")[0]
+
+    assert_equal(min, desc.min, 'min')
+    assert_equal(max, desc.max, 'max')
+    assert_equal(incr, desc.incr, 'incr')
+    assert_equal(cache, desc.cache, 'cache')
+    assert_equal(order, desc.order?, 'order?')
+    assert_operator(currval, :<=, desc.hw_mark, 'hw_mark')
+  end
+
+  def test_sequence
+    begin
+      @conn.exec("DROP SEQUENCE TEST_SEQ_OCI8")
+    rescue OCIError
+      raise if $!.code != 2289 # ORA-02289: sequence does not exist
+    end
+    @conn.exec(<<-EOS)
+CREATE SEQUENCE TEST_SEQ_OCI8
+    INCREMENT BY 2
+    START WITH 998
+    MAXVALUE 1000
+    MINVALUE 10
+    CYCLE
+    CACHE 5
+    ORDER
+EOS
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_any('test_seq_oci8'))
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_sequence('test_seq_oci8'))
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_schema(@conn.username).objects.detect do |obj|
+                      obj.obj_name == 'TEST_SEQ_OCI8'
+                    end)
+
+    @conn.exec("DROP SEQUENCE TEST_SEQ_OCI8")
+    @conn.exec(<<-EOS)
+CREATE SEQUENCE TEST_SEQ_OCI8
+    INCREMENT BY -1
+    NOMAXVALUE
+    NOMINVALUE
+    NOCYCLE
+    NOCACHE
+    NOORDER
+EOS
+    # @conn.describe_any('test_seq_oci8').min is:
+    #   -99999999999999999999999999 on Oracle 10gR2
+    #   -999999999999999999999999999 on Oracle 11gR2
+
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_any('test_seq_oci8'))
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_sequence('test_seq_oci8'))
+    @conn.select_one('select test_seq_oci8.nextval from dual')
+    assert_sequence('TEST_SEQ_OCI8', @conn.describe_schema(@conn.username).objects.detect do |obj|
+                      obj.obj_name == 'TEST_SEQ_OCI8'
+                    end)
+
+    @conn.exec("DROP SEQUENCE TEST_SEQ_OCI8")
+  end
+
 end # TestMetadata