ruby-plsql 0.4.4 → 0.5.0

data/lib/plsql/procedure_call.rb

@@ -290,6 +290,7 @@ module PLSQL
       # insert values without autocommit
       old_autocommit = @schema.connection.autocommit?
       @schema.connection.autocommit = false if old_autocommit
+      tmp_table.delete
       case argument_metadata[:element][:data_type]
       when 'PL/SQL RECORD'
         values_with_index = []
@@ -401,7 +402,7 @@ module PLSQL
       @return_sql << if is_index_by_table
         "i__ := l_#{argument}.FIRST;\nLOOP\nEXIT WHEN i__ IS NULL;\n"
       else
-        "FOR i__ IN l_#{argument}.FIRST..l_#{argument}.LAST LOOP\n"
+        "IF l_#{argument}.COUNT > 0 THEN\nFOR i__ IN l_#{argument}.FIRST..l_#{argument}.LAST LOOP\n"
       end
       case argument_metadata[:element][:data_type]
       when 'PL/SQL RECORD'
@@ -415,6 +416,7 @@ module PLSQL
       end
       @return_sql << "i__ := l_#{argument}.NEXT(i__);\n" if is_index_by_table
       @return_sql << "END LOOP;\n"
+      @return_sql << "END IF;\n" unless is_index_by_table
       @return_sql << "OPEN :#{argument} FOR SELECT #{return_fields_string} FROM #{argument_metadata[:tmp_table_name]} ORDER BY i__;\n"
       @return_sql << "DELETE FROM #{argument_metadata[:tmp_table_name]};\n"
       "l_#{argument} := " if is_return_value

data/ruby-plsql.gemspec

@@ -1,101 +1,87 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{ruby-plsql}
-  s.version = "0.4.4"
+  s.name = "ruby-plsql"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2010-10-06}
-  s.description = %q{ruby-plsql gem provides simple Ruby API for calling Oracle PL/SQL procedures.
-It could be used both for accessing Oracle PL/SQL API procedures in legacy applications
-as well as it could be used to create PL/SQL unit tests using Ruby testing libraries.
-}
-  s.email = %q{raimonds.simanovskis@gmail.com}
+  s.date = "2012-04-16"
+  s.description = "ruby-plsql gem provides simple Ruby API for calling Oracle PL/SQL procedures.\nIt could be used both for accessing Oracle PL/SQL API procedures in legacy applications\nas well as it could be used to create PL/SQL unit tests using Ruby testing libraries.\n"
+  s.email = "raimonds.simanovskis@gmail.com"
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "History.txt",
-     "License.txt",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/plsql/connection.rb",
-     "lib/plsql/helpers.rb",
-     "lib/plsql/jdbc_connection.rb",
-     "lib/plsql/oci8_patches.rb",
-     "lib/plsql/oci_connection.rb",
-     "lib/plsql/package.rb",
-     "lib/plsql/procedure.rb",
-     "lib/plsql/procedure_call.rb",
-     "lib/plsql/schema.rb",
-     "lib/plsql/sequence.rb",
-     "lib/plsql/sql_statements.rb",
-     "lib/plsql/table.rb",
-     "lib/plsql/type.rb",
-     "lib/plsql/variable.rb",
-     "lib/plsql/version.rb",
-     "lib/plsql/view.rb",
-     "lib/ruby-plsql.rb",
-     "lib/ruby_plsql.rb",
-     "ruby-plsql.gemspec",
-     "spec/plsql/connection_spec.rb",
-     "spec/plsql/package_spec.rb",
-     "spec/plsql/procedure_spec.rb",
-     "spec/plsql/schema_spec.rb",
-     "spec/plsql/sequence_spec.rb",
-     "spec/plsql/sql_statements_spec.rb",
-     "spec/plsql/table_spec.rb",
-     "spec/plsql/type_spec.rb",
-     "spec/plsql/variable_spec.rb",
-     "spec/plsql/version_spec.rb",
-     "spec/plsql/view_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/rsim/ruby-plsql}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby API for calling Oracle PL/SQL procedures.}
-  s.test_files = [
+    "Gemfile",
+    "History.txt",
+    "License.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/plsql/connection.rb",
+    "lib/plsql/helpers.rb",
+    "lib/plsql/jdbc_connection.rb",
+    "lib/plsql/oci8_patches.rb",
+    "lib/plsql/oci_connection.rb",
+    "lib/plsql/package.rb",
+    "lib/plsql/procedure.rb",
+    "lib/plsql/procedure_call.rb",
+    "lib/plsql/schema.rb",
+    "lib/plsql/sequence.rb",
+    "lib/plsql/sql_statements.rb",
+    "lib/plsql/table.rb",
+    "lib/plsql/type.rb",
+    "lib/plsql/variable.rb",
+    "lib/plsql/version.rb",
+    "lib/plsql/view.rb",
+    "lib/ruby-plsql.rb",
+    "lib/ruby_plsql.rb",
+    "ruby-plsql.gemspec",
     "spec/plsql/connection_spec.rb",
-     "spec/plsql/package_spec.rb",
-     "spec/plsql/procedure_spec.rb",
-     "spec/plsql/schema_spec.rb",
-     "spec/plsql/sequence_spec.rb",
-     "spec/plsql/sql_statements_spec.rb",
-     "spec/plsql/table_spec.rb",
-     "spec/plsql/type_spec.rb",
-     "spec/plsql/variable_spec.rb",
-     "spec/plsql/version_spec.rb",
-     "spec/plsql/view_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/plsql/package_spec.rb",
+    "spec/plsql/procedure_spec.rb",
+    "spec/plsql/schema_spec.rb",
+    "spec/plsql/sequence_spec.rb",
+    "spec/plsql/sql_statements_spec.rb",
+    "spec/plsql/table_spec.rb",
+    "spec/plsql/type_spec.rb",
+    "spec/plsql/variable_spec.rb",
+    "spec/plsql/version_spec.rb",
+    "spec/plsql/view_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
+  s.homepage = "http://github.com/rsim/ruby-plsql"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Ruby API for calling Oracle PL/SQL procedures."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<activerecord>, ["= 2.3.8"])
-      s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.3.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.9"])
+      s.add_development_dependency(%q<activerecord>, ["~> 3.2.3"])
+      s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
+      s.add_development_dependency(%q<ruby-oci8>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<activerecord>, ["= 2.3.8"])
-      s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.3.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.9"])
+      s.add_dependency(%q<activerecord>, ["~> 3.2.3"])
+      s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
+      s.add_dependency(%q<ruby-oci8>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<activerecord>, ["= 2.3.8"])
-    s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.3.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.9"])
+    s.add_dependency(%q<activerecord>, ["~> 3.2.3"])
+    s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
+    s.add_dependency(%q<ruby-oci8>, [">= 0"])
   end
 end
 

data/spec/plsql/connection_spec.rb

@@ -7,6 +7,7 @@ describe "Connection" do
   before(:all) do
     @raw_conn = get_connection
     @conn = PLSQL::Connection.create( @raw_conn )
+    @conn.set_time_zone
   end
 
   after(:all) do
@@ -18,28 +19,33 @@ describe "Connection" do
   end
 
   describe "create and destroy" do
+    before(:all) do
+      @raw_conn1 = get_connection
+    end
+
     before(:each) do
-      @conn = PLSQL::Connection.create( @raw_conn )
+      @conn1 = PLSQL::Connection.create( @raw_conn1 )
+      @conn1.set_time_zone
     end
 
     it "should create connection" do
-      @conn.raw_connection.should == @raw_conn
+      @conn1.raw_connection.should == @raw_conn1
     end
 
     unless defined?(JRuby)
       it "should be oci connection" do
-        @conn.should be_oci
-        @conn.raw_driver.should == :oci
+        @conn1.should be_oci
+        @conn1.raw_driver.should == :oci
       end
     else
       it "should be jdbc connection" do
-        @conn.should be_jdbc
-        @conn.raw_driver.should == :jdbc
+        @conn1.should be_jdbc
+        @conn1.raw_driver.should == :jdbc
       end
     end
 
     it "should logoff connection" do
-      @conn.logoff.should be_true
+      @conn1.logoff.should be_true
     end
 
   end
@@ -153,10 +159,9 @@ describe "Connection" do
         ora_value.freeTemporary
       end
 
-      it "should translate Ruby nil value to empty Java::OracleSql::CLOB when Java::OracleSql::CLOB type specified" do
+      it "should translate Ruby nil value to nil when Java::OracleSql::CLOB type specified" do
         ora_value = @conn.ruby_value_to_ora_value(nil, Java::OracleSql::CLOB)
-        ora_value.class.should == Java::OracleSql::CLOB
-        ora_value.isEmptyLob.should be_true
+        ora_value.should be_nil
       end
 
       it "should translate Oracle BigDecimal integer value to Fixnum" do
@@ -459,6 +464,7 @@ describe "Connection" do
     def reconnect_connection
       @raw_conn = get_connection
       @conn = PLSQL::Connection.create( @raw_conn )
+      @conn.set_time_zone
     end
 
     it "should drop current session ruby temporary tables" do

data/spec/plsql/procedure_spec.rb

@@ -3,17 +3,9 @@
 require 'spec_helper'
 
 describe "Parameter type mapping /" do
-  before(:all) do
-    plsql.connect! CONNECTION_PARAMS
-  end
-
-  after(:all) do
-    plsql.logoff
-  end
-
   describe "Function with string parameters" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_uppercase
           ( p_string VARCHAR2 )
@@ -27,6 +19,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP FUNCTION test_uppercase"
+      plsql.logoff
     end
   
     it "should find existing procedure" do
@@ -64,8 +57,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with numeric parameters" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_sum
           ( p_num1 NUMBER, p_num2 NUMBER )
@@ -107,6 +100,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP FUNCTION test_sum"
       plsql.execute "DROP FUNCTION test_number_1"
       plsql.execute "DROP PROCEDURE test_integers"
+      plsql.logoff
     end
   
     it "should process integer parameters" do
@@ -145,6 +139,7 @@ describe "Parameter type mapping /" do
   describe "Function with date parameters" do
   
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_date
           ( p_date DATE )
@@ -162,6 +157,7 @@ describe "Parameter type mapping /" do
 
     after(:all) do
       plsql.execute "DROP FUNCTION test_date"
+      plsql.logoff
     end
   
     it "should process Time parameters" do
@@ -210,8 +206,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with timestamp parameters" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_timestamp
           ( p_time TIMESTAMP )
@@ -225,6 +221,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP FUNCTION test_timestamp"
+      plsql.logoff
     end
   
     it "should process timestamp parameters" do
@@ -237,6 +234,7 @@ describe "Parameter type mapping /" do
 
   describe "Procedure with output parameters" do
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_copy
           ( p_from VARCHAR2, p_to OUT VARCHAR2, p_to_double OUT VARCHAR2 )
@@ -250,6 +248,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP PROCEDURE test_copy"
+      plsql.logoff
     end
   
     it "should return hash with output parameters" do
@@ -272,6 +271,7 @@ describe "Parameter type mapping /" do
 
   describe "Package with procedures with same name but different argument lists" do
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE test_package2 IS
           FUNCTION test_procedure ( p_string VARCHAR2 )
@@ -331,6 +331,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP PACKAGE test_package2"
+      plsql.logoff
     end
     
     it "should find existing package" do
@@ -380,6 +381,7 @@ describe "Parameter type mapping /" do
 
   describe "Function with output parameters" do
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_function
           ( p_from VARCHAR2, p_to OUT VARCHAR2, p_to_double OUT VARCHAR2 )
@@ -395,6 +397,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP FUNCTION test_copy_function"
+      plsql.logoff
     end
   
     it "should return array with return value and hash of output parameters" do
@@ -414,6 +417,7 @@ describe "Parameter type mapping /" do
 
   describe "Function or procedure without parameters" do
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_no_params
           RETURN VARCHAR2
@@ -434,6 +438,7 @@ describe "Parameter type mapping /" do
     after(:all) do
       plsql.execute "DROP FUNCTION test_no_params"
       plsql.execute "DROP PROCEDURE test_proc_no_params"
+      plsql.logoff
     end
 
     it "should find function" do
@@ -455,8 +460,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with CLOB parameter and return value" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_clob
           ( p_clob CLOB )
@@ -466,10 +471,35 @@ describe "Parameter type mapping /" do
           RETURN p_clob;
         END test_clob;
       SQL
+      plsql.execute "CREATE TABLE test_clob_table (clob_col CLOB)"
+      plsql.execute <<-SQL
+        CREATE OR REPLACE FUNCTION test_clob_insert
+          ( p_clob CLOB )
+          RETURN CLOB
+        IS
+          CURSOR clob_cur IS
+          SELECT clob_col
+          FROM test_clob_table;
+          
+          v_dummy  CLOB;
+        BEGIN
+          DELETE FROM test_clob_table;
+          INSERT INTO test_clob_table (clob_col) VALUES (p_clob);
+
+          OPEN clob_cur;
+          FETCH clob_cur INTO v_dummy;
+          CLOSE clob_cur;
+          
+          RETURN v_dummy;
+        END test_clob_insert;
+      SQL
     end
   
     after(:all) do
       plsql.execute "DROP FUNCTION test_clob"
+      plsql.execute "DROP FUNCTION test_clob_insert"
+      plsql.execute "DROP TABLE test_clob_table"
+      plsql.logoff
     end
   
     it "should find existing procedure" do
@@ -487,6 +517,11 @@ describe "Parameter type mapping /" do
         text = ''
         plsql.test_clob(text).should be_nil
       end
+
+      it "should execute function which inserts the CLOB parameter into a table with empty string and return nil" do
+        text = ''
+        plsql.test_clob_insert(text).should be_nil
+      end
     
     else
 
@@ -501,11 +536,15 @@ describe "Parameter type mapping /" do
       plsql.test_clob(nil).should be_nil
     end
 
+    it "should execute function which inserts the CLOB parameter into a table with nil and return nil" do
+      plsql.test_clob_insert(nil).should be_nil
+    end
+    
   end
 
   describe "Procedrue with CLOB parameter and return value" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_clob_proc
           ( p_clob CLOB,
@@ -519,6 +558,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP PROCEDURE test_clob_proc"
+      plsql.logoff
     end
   
     it "should find existing procedure" do
@@ -532,8 +572,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Procedrue with BLOB parameter and return value" do
-  
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_blob_proc
           ( p_blob BLOB,
@@ -547,6 +587,7 @@ describe "Parameter type mapping /" do
   
     after(:all) do
       plsql.execute "DROP PROCEDURE test_blob_proc"
+      plsql.logoff
     end
   
     it "should find existing procedure" do
@@ -560,8 +601,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with record parameter" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute "DROP TABLE test_employees" rescue nil
       plsql.execute <<-SQL
         CREATE TABLE test_employees (
@@ -587,8 +628,14 @@ describe "Parameter type mapping /" do
             last_name     VARCHAR2(50),
             hire_date     DATE
           );
-          FUNCTION test_full_name (p_employee t_employee)
+
+          TYPE table_of_records IS TABLE OF t_employee;
+
+          FUNCTION test_full_name(p_employee t_employee)
             RETURN VARCHAR2;
+
+          FUNCTION test_empty_records
+            RETURN table_of_records;
         END;
       SQL
       plsql.execute <<-SQL
@@ -599,6 +646,26 @@ describe "Parameter type mapping /" do
           BEGIN
             RETURN p_employee.first_name || ' ' || p_employee.last_name;
           END;
+
+          FUNCTION test_empty_records
+            RETURN table_of_records
+          IS
+            CURSOR employees_cur
+            IS
+              SELECT 
+                null employee_id,
+                null first_name,
+                null last_name,
+                null hire_date
+              FROM dual
+              WHERE 1 = 2;
+            employees_tab table_of_records;
+          BEGIN
+            OPEN employees_cur;
+            FETCH employees_cur BULK COLLECT INTO employees_tab;
+            CLOSE employees_cur;
+            RETURN employees_tab;
+          END;
         END;
       SQL
       plsql.execute <<-SQL
@@ -641,6 +708,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP FUNCTION test_employee_record"
       plsql.execute "DROP FUNCTION test_employee_record2"
       plsql.execute "DROP TABLE test_employees"
+      plsql.logoff
     end
 
     it "should find existing function" do
@@ -664,6 +732,10 @@ describe "Parameter type mapping /" do
         plsql.test_full_name(@p_employee.merge :xxx => 'xxx').should == 'Second Last'
       end.should raise_error(ArgumentError)
     end
+    
+    it "should return empty table of records" do
+      plsql.test_record.test_empty_records().should == []
+    end
 
     it "should return record return value" do
       plsql.test_employee_record(@p_employee).should == @p_employee
@@ -680,8 +752,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with boolean parameters" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_boolean
           ( p_boolean BOOLEAN )
@@ -704,6 +776,7 @@ describe "Parameter type mapping /" do
     after(:all) do
       plsql.execute "DROP FUNCTION test_boolean"
       plsql.execute "DROP PROCEDURE test_boolean2"
+      plsql.logoff
     end
 
     it "should accept true value and return true value" do
@@ -733,8 +806,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with object type parameter" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute "DROP TYPE t_employee" rescue nil
       plsql.execute "DROP TYPE t_phones" rescue nil
       plsql.execute <<-SQL
@@ -806,6 +879,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP TYPE t_address"
       plsql.execute "DROP TYPE t_phones"
       plsql.execute "DROP TYPE t_phone"
+      plsql.logoff
     end
 
     it "should find existing function" do
@@ -834,12 +908,16 @@ describe "Parameter type mapping /" do
       plsql.test_employee_object2(@p_employee, nil).should == [@p_employee, {:x_employee => @p_employee}]
     end
 
+    it "should accept NULL as input parameter" do
+      plsql.test_employee_object(nil).should == nil
+    end
+
   end
 
 
   describe "Function with table parameter" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       # Array of numbers
       plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_numbers AS TABLE OF NUMBER(15)
@@ -862,7 +940,7 @@ describe "Parameter type mapping /" do
           END IF;
         END;
       SQL
-
+      
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_increment(p_numbers IN t_numbers, p_increment_by IN NUMBER DEFAULT 1)
           RETURN t_numbers
@@ -905,6 +983,8 @@ describe "Parameter type mapping /" do
           TYPE t_numbers IS TABLE OF NUMBER(15);
           FUNCTION test_sum (p_numbers IN t_numbers)
             RETURN NUMBER;
+          FUNCTION test_function_failure (p_numbers IN t_numbers, p_force_failure IN VARCHAR2 DEFAULT 'N')
+            RETURN NUMBER;
           FUNCTION test_numbers (p_numbers IN t_numbers, x_numbers OUT t_numbers)
             RETURN t_numbers;
           TYPE t_employee IS RECORD(
@@ -929,6 +1009,18 @@ describe "Parameter type mapping /" do
           TYPE t_employees2 IS TABLE OF t_employee2;
           FUNCTION test_employees2 (p_employees IN OUT t_employees2)
             RETURN t_employees2;
+
+          TYPE t_nstring IS RECORD(
+            ch_10bytes    CHAR(10 BYTE),
+            ch_10chars    CHAR(10 CHAR),
+            nch_10chars   NCHAR(10 CHAR),
+            str_10bytes   VARCHAR2(10 BYTE),
+            str_10chars   VARCHAR2(10 CHAR),
+            nstr_10chars  NVARCHAR2(10)
+          );
+          TYPE t_nstrings IS TABLE OF t_nstring;
+          FUNCTION test_nstring (p_strings IN t_nstrings, p_out OUT t_nstrings)
+            return NVARCHAR2;
         END;
       SQL
       plsql.execute <<-SQL
@@ -949,6 +1041,15 @@ describe "Parameter type mapping /" do
               RETURN NULL;
             END IF;
           END;
+          FUNCTION test_function_failure (p_numbers IN t_numbers, p_force_failure IN VARCHAR2 DEFAULT 'N')
+          RETURN NUMBER
+          IS
+          BEGIN
+            IF p_force_failure = 'Y' THEN
+              raise_application_error(-20000, 'Simulate business error to test clearing of temp table.');
+            END IF;
+            RETURN p_numbers.COUNT;
+          END;
           FUNCTION test_numbers (p_numbers IN t_numbers, x_numbers OUT t_numbers)
           RETURN t_numbers
           IS
@@ -974,6 +1075,23 @@ describe "Parameter type mapping /" do
           BEGIN
             RETURN p_employees;
           END;
+          FUNCTION test_nstring (p_strings IN t_nstrings, p_out OUT t_nstrings)
+            return NVARCHAR2
+          IS
+            tmp1 NVARCHAR2(2000);
+            x    pls_integer;
+          BEGIN
+            p_out := p_strings;
+            IF p_strings.count=0 THEN
+              RETURN N'';
+            END IF;
+            x := p_strings.first;
+            WHILE x IS NOT NULL LOOP
+              tmp1 := tmp1 || rtrim(p_strings(x).nch_10chars) || p_strings(x).nstr_10chars || ',';
+              x := p_strings.next(x);
+            END LOOP;
+            RETURN tmp1;
+          END;
         END;
       SQL
       @employees = (1..10).map do |i|
@@ -984,6 +1102,16 @@ describe "Parameter type mapping /" do
           :hire_date => Time.local(2000,01,i),
         }
       end
+      @nstrings = (1..5).map do |i|
+        {
+          :ch_10bytes => "Ch #{i}B     ",
+          :ch_10chars => "Ch #{i}C     ",
+          :nch_10chars => "NCh #{i}     ",
+          :str_10bytes => "Str #{i}C",
+          :str_10chars => "Str #{i}B",
+          :nstr_10chars => "NStr #{i}",
+        }
+      end
 
       # Array of objects
       plsql.execute <<-SQL
@@ -1017,6 +1145,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP TYPE t_phones"
       plsql.execute "DROP TYPE t_phone"
       plsql.connection.drop_session_ruby_temporary_tables
+      plsql.logoff
     end
 
     it "should find existing function" do
@@ -1026,7 +1155,7 @@ describe "Parameter type mapping /" do
     it "should execute function with number array parameter" do
       plsql.test_sum([1,2,3,4]).should == 10
     end
-
+    
     it "should return number array return value" do
       plsql.test_increment([1,2,3,4], 1).should == [2,3,4,5]
     end
@@ -1040,6 +1169,15 @@ describe "Parameter type mapping /" do
       plsql.test_collections.test_sum([1,2,3,4]).should == 10
     end
 
+    it "should clear temporary tables after executing function with table of numbers type even if an error occurs in the package" do
+      # this should work fine
+      plsql.test_collections.test_function_failure([1,2,3,4], 'N').should == 4
+      # we will force a package error here to see if things get cleaned up before the next call
+      lambda { plsql.test_collections.test_function_failure([1,2,3,4], 'Y') }.should raise_error(/Simulate business error to test clearing of temp table/)
+      # after the error in the first call temporary tables should be cleared
+      plsql.test_collections.test_function_failure([5,6,7], 'N').should == 3
+    end
+
     it "should return table of numbers type (defined inside package)" do
       plsql.test_collections.test_numbers([1,2,3,4]).should == [[1,2,3,4], {:x_numbers => [1,2,3,4]}]
     end
@@ -1064,6 +1202,10 @@ describe "Parameter type mapping /" do
       plsql.test_collections.test_employees(@employees).should == [@employees, {:p_employees => @employees}]
     end
 
+    it "should execute function with table of records type (defined inside package and includes NVARCHAR columns) parameter" do
+      plsql.test_collections.test_nstring(@nstrings).should == [(1..5).map{|i| "NCh #{i}NStr #{i},"}.join, {:p_out => @nstrings}]
+    end
+
     it "should execute function with object array and return object array output parameter" do
       phones = [{:type => 'mobile', :phone_number => '123456'}, {:type => 'home', :phone_number => '654321'}]
       plsql.test_copy_objects(phones).should == [phones, {:x_phones => phones}]
@@ -1089,8 +1231,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with table indexed by bynary integer parameter" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE TABLE test_employees (
           employee_id   NUMBER(15),
@@ -1106,6 +1248,8 @@ describe "Parameter type mapping /" do
             INDEX BY BINARY_INTEGER;
           FUNCTION test_sum (p_numbers IN t_numbers)
             RETURN NUMBER;
+          FUNCTION test_function_failure (p_numbers IN t_numbers, p_force_failure IN VARCHAR2 DEFAULT 'N')
+            RETURN NUMBER;
           FUNCTION test_numbers (p_numbers IN t_numbers, x_numbers OUT t_numbers)
             RETURN t_numbers;
           TYPE t_employee IS RECORD(
@@ -1142,6 +1286,27 @@ describe "Parameter type mapping /" do
               RETURN NULL;
             END IF;
           END;
+          FUNCTION test_function_failure (p_numbers IN t_numbers, p_force_failure IN VARCHAR2 DEFAULT 'N')
+          RETURN NUMBER
+          IS
+            l_sum   NUMBER(15) := 0;
+            i BINARY_INTEGER;
+          BEGIN
+            IF p_force_failure = 'Y' THEN
+              raise_application_error(-20000, 'Simulate business error to test clearing of temp table.');
+            END IF;
+            IF p_numbers.COUNT > 0 THEN
+              i := p_numbers.FIRST;
+              LOOP
+                EXIT WHEN i IS NULL;
+                l_sum := l_sum + p_numbers(i);
+                i := p_numbers.NEXT(i);
+              END LOOP;
+              RETURN l_sum;
+            ELSE
+              RETURN NULL;
+            END IF;
+          END;
           FUNCTION test_numbers (p_numbers IN t_numbers, x_numbers OUT t_numbers)
           RETURN t_numbers
           IS
@@ -1169,21 +1334,32 @@ describe "Parameter type mapping /" do
       SQL
       # test with negative PL/SQL table indexes
       @numbers = Hash[*(1..4).map{|i|[-i,i]}.flatten]
+      @numbers2 = Hash[*(5..7).map{|i|[-i,i]}.flatten]
       # test with reversed PL/SQL table indexes
       @employees = Hash[*(1..10).map do |i|
-        [11-i, {
-          :employee_id => i,
-          :first_name => "First #{i}",
-          :last_name => "Last #{i}",
-          :hire_date => Time.local(2000,01,i)
-        }]
-      end.flatten]
+          [11-i, {
+              :employee_id => i,
+              :first_name => "First #{i}",
+              :last_name => "Last #{i}",
+              :hire_date => Time.local(2000,01,i)
+            }]
+        end.flatten]
     end
 
     after(:all) do
       plsql.execute "DROP PACKAGE test_collections"
       plsql.execute "DROP TABLE test_employees"
       plsql.connection.drop_session_ruby_temporary_tables
+      plsql.logoff
+    end
+
+    it "should clear temporary tables after executing function with index-by table of numbers type even if an error occurs in the package" do
+      # this should work fine
+      plsql.test_collections.test_function_failure(@numbers, 'N').should == 10
+      # we will force a package error here to see if things get cleaned up before the next call
+      lambda { plsql.test_collections.test_function_failure(@numbers, 'Y') }.should raise_error(/Simulate business error to test clearing of temp table/)
+      # after the error in the first call temporary tables should be cleared
+      plsql.test_collections.test_function_failure(@numbers2, 'N').should == 18
     end
 
     it "should execute function with index-by table of numbers type (defined inside package) parameter" do
@@ -1244,8 +1420,8 @@ describe "Parameter type mapping /" do
 
 
   describe "Function with VARRAY parameter" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       # Array of numbers
       plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_numbers_array AS VARRAY(100) OF NUMBER(15)
@@ -1266,7 +1442,7 @@ describe "Parameter type mapping /" do
           END IF;
         END;
       SQL
-    
+
       plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_increment(p_numbers IN t_numbers_array, p_increment_by IN NUMBER DEFAULT 1)
           RETURN t_numbers_array
@@ -1280,7 +1456,7 @@ describe "Parameter type mapping /" do
           RETURN l_numbers;
         END;
       SQL
-    
+
       # Array of strings
       plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_strings_array AS VARRAY(100) OF VARCHAR2(4000)
@@ -1330,6 +1506,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP TYPE t_strings_array"
       plsql.execute "DROP TYPE t_phones_array"
       plsql.execute "DROP TYPE t_phone"
+      plsql.logoff
     end
 
     it "should find existing function" do
@@ -1361,9 +1538,148 @@ describe "Parameter type mapping /" do
 
   end
 
-  describe "Function with cursor return value or parameter" do
+  describe "Function in package with VARRAY parameter" do
+    before(:all) do
+      plsql.connect! CONNECTION_PARAMS
+      plsql.execute <<-SQL
+        CREATE OR REPLACE TYPE t_phone AS OBJECT (
+          type            VARCHAR2(10),
+          phone_number    VARCHAR2(50)
+        )
+      SQL
+
+      plsql.execute <<-SQL
+        CREATE OR REPLACE PACKAGE test_collections IS
+          TYPE t_numbers_array IS VARRAY(100) OF NUMBER(15);
+          TYPE t_strings_array IS VARRAY(100) OF VARCHAR2(4000);
+          TYPE t_phones_array IS ARRAY(100) OF T_PHONE;
+          FUNCTION test_sum (p_numbers IN t_numbers_array)
+            RETURN NUMBER;
+          FUNCTION test_function_failure (p_numbers IN t_numbers_array, p_force_failure IN VARCHAR2 DEFAULT 'N')
+            RETURN NUMBER;
+          FUNCTION test_increment(p_numbers IN t_numbers_array, p_increment_by IN NUMBER DEFAULT 1)
+            RETURN t_numbers_array;
+          FUNCTION test_copy_strings(p_strings IN t_strings_array, x_strings OUT t_strings_array)
+            RETURN t_strings_array;
+          FUNCTION test_copy_objects(p_phones IN t_phones_array, x_phones OUT t_phones_array)
+            RETURN t_phones_array;
+        END;
+      SQL
+
+      plsql.execute <<-SQL
+        CREATE OR REPLACE PACKAGE BODY test_collections IS
+          FUNCTION test_sum (p_numbers IN t_numbers_array)
+            RETURN NUMBER
+          IS
+            l_sum   NUMBER(15) := 0;
+          BEGIN
+            IF p_numbers.COUNT > 0 THEN
+              FOR i IN p_numbers.FIRST..p_numbers.LAST LOOP
+                l_sum := l_sum + p_numbers(i);
+              END LOOP;
+              RETURN l_sum;
+            ELSE
+              RETURN NULL;
+            END IF;
+          END;
+
+          FUNCTION test_function_failure (p_numbers IN t_numbers_array, p_force_failure IN VARCHAR2 DEFAULT 'N')
+            RETURN NUMBER
+          IS
+            l_sum   NUMBER(15) := 0;
+          BEGIN
+            IF p_force_failure = 'Y' THEN
+              raise_application_error(-20000, 'Simulate business error to test clearing of temp table.');
+            END IF;
+            IF p_numbers.COUNT > 0 THEN
+              FOR i IN p_numbers.FIRST..p_numbers.LAST LOOP
+                l_sum := l_sum + p_numbers(i);
+              END LOOP;
+              RETURN l_sum;
+            ELSE
+              RETURN NULL;
+            END IF;
+          END;
 
+          FUNCTION test_increment(p_numbers IN t_numbers_array, p_increment_by IN NUMBER DEFAULT 1)
+            RETURN t_numbers_array
+          IS
+            l_numbers t_numbers_array := t_numbers_array();
+          BEGIN
+            FOR i IN p_numbers.FIRST..p_numbers.LAST LOOP
+              l_numbers.EXTEND;
+              l_numbers(i) := p_numbers(i) + p_increment_by;
+            END LOOP;
+            RETURN l_numbers;
+          END;
+
+          FUNCTION test_copy_strings(p_strings IN t_strings_array, x_strings OUT t_strings_array)
+            RETURN t_strings_array
+          IS
+          BEGIN
+            x_strings := t_strings_array();
+            FOR i IN p_strings.FIRST..p_strings.LAST LOOP
+              x_strings.EXTEND;
+              x_strings(i) := p_strings(i);
+            END LOOP;
+            RETURN x_strings;
+          END;
+
+          FUNCTION test_copy_objects(p_phones IN t_phones_array, x_phones OUT t_phones_array)
+            RETURN t_phones_array
+          IS
+          BEGIN
+            x_phones := p_phones;
+            RETURN x_phones;
+          END;
+        END;
+      SQL
+    end
+
+    after(:all) do
+      plsql.execute "DROP PACKAGE test_collections"
+      plsql.execute "DROP TYPE t_phone" rescue nil
+      plsql.logoff
+    end
+
+    it "should execute function with number array parameter" do
+      plsql.test_collections.test_sum([1,2,3,4]).should == 10
+    end
+
+    it "should clear temporary tables after executing function with varray of numbers type even if an error occurs in the package" do
+      # this should work fine
+      plsql.test_collections.test_function_failure([1,2,3,4], 'N').should == 10
+      # we will force a package error here to see if things get cleaned up before the next call
+      lambda { plsql.test_collections.test_function_failure([5,6,7], 'Y') }.should raise_error(/Simulate business error to test clearing of temp table/)
+      # after the error in the first call temporary tables should be cleared
+      plsql.test_collections.test_function_failure([3,4,5,6], 'N').should == 18
+    end
+
+    it "should return number array return value" do
+      plsql.test_collections.test_increment([1,2,3,4], 1).should == [2,3,4,5]
+    end
+
+    it "should execute function with string array and return string array output parameter" do
+      strings = ['1','2','3','4']
+      plsql.test_collections.test_copy_strings(strings).should == [strings, {:x_strings => strings}]
+    end
+
+    it "should execute function with object array and return object array output parameter" do
+      phones = [{:type => 'mobile', :phone_number => '123456'}, {:type => 'home', :phone_number => '654321'}]
+      plsql.test_collections.test_copy_objects(phones).should == [phones, {:x_phones => phones}]
+    end
+
+    # This test fails without wcmatthysen's "Procedure-call Fix." pull request.
+    # it "should execute function with empty object array" do
+    #   phones = []
+    #   plsql.test_collections.test_copy_objects(phones).should == [phones, {:x_phones => phones}]
+    # end
+
+  end
+
+  describe "Function with cursor return value or parameter" do
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute "DROP TABLE test_employees" rescue nil
       plsql.execute <<-SQL
         CREATE TABLE test_employees (
@@ -1431,6 +1747,7 @@ describe "Parameter type mapping /" do
       plsql.execute "DROP PROCEDURE test_insert_employee"
       plsql.execute "DROP FUNCTION test_cursor_fetch"
       plsql.execute "DROP TABLE test_employees"
+      plsql.logoff
     end
 
     it "should find existing function" do
@@ -1497,6 +1814,7 @@ describe "Parameter type mapping /" do
 
     it "should execute function with cursor parameter and return record" do
       pending "not possible from JDBC" if defined?(JRUBY_VERSION)
+      pending "fails with core dump with ruby-oci8 2.1.0" if OCI8::VERSION >= "2.1.0"
       plsql.test_cursor do |cursor|
         plsql.test_cursor_fetch(cursor).should == @employees[0]
       end
@@ -1505,8 +1823,8 @@ describe "Parameter type mapping /" do
   end
 
   describe "Function with typed ref cursor return value" do
-
     before(:all) do
+      plsql.connect! CONNECTION_PARAMS
       plsql.execute "DROP TABLE typed_ref_cursor_table" rescue nil
 
       plsql.execute <<-SQL
@@ -1544,6 +1862,7 @@ describe "Parameter type mapping /" do
     after(:all) do
       plsql.execute "DROP PACKAGE typed_ref_cursor_test"
       plsql.execute "DROP TABLE typed_ref_cursor_table"
+      plsql.logoff
     end
 
     it "should return cursor and fetch first row" do
@@ -1569,7 +1888,6 @@ describe "Parameter type mapping /" do
 end
 
 describe "Synonyms /" do
-
   before(:all) do
     plsql.connect! CONNECTION_PARAMS
   end