ruby-plsql 0.4.0 → 0.4.1

data/lib/ruby_plsql.rb

@@ -2,7 +2,7 @@ require "time"
 require "date"
 require "bigdecimal"
 
-%w(connection sql_statements schema procedure procedure_call package table sequence).each do |file|
+%w(connection sql_statements schema procedure procedure_call package variable table view sequence type version helpers).each do |file|
   require "plsql/#{file}"
 end
 

data/spec/plsql/connection_spec.rb

@@ -6,42 +6,46 @@ describe "Connection" do
 
   before(:all) do
     @raw_conn = get_connection
+    @conn = PLSQL::Connection.create( @raw_conn )
   end
 
   after(:all) do
-    unless defined?(JRUBY_VERSION)
+    unless defined?(JRuby)
       @raw_conn.logoff rescue nil
     else
       @raw_conn.close rescue nil
     end
   end
 
-  before(:each) do
-    @conn = PLSQL::Connection.create( @raw_conn )
-  end
+  describe "create and destroy" do
+    before(:each) do
+      @conn = PLSQL::Connection.create( @raw_conn )
+    end
 
-  it "should create connection" do
-    @conn.raw_connection.should == @raw_conn
-  end
+    it "should create connection" do
+      @conn.raw_connection.should == @raw_conn
+    end
 
-  unless defined?(JRUBY_VERSION)
-    it "should be oci connection" do
-      @conn.should be_oci
-      @conn.raw_driver.should == :oci
+    unless defined?(JRuby)
+      it "should be oci connection" do
+        @conn.should be_oci
+        @conn.raw_driver.should == :oci
+      end
+    else
+      it "should be jdbc connection" do
+        @conn.should be_jdbc
+        @conn.raw_driver.should == :jdbc
+      end
     end
-  else
-    it "should be jdbc connection" do
-      @conn.should be_jdbc
-      @conn.raw_driver.should == :jdbc
+
+    it "should logoff connection" do
+      @conn.logoff.should be_true
     end
+
   end
-  
-  it "should logoff connection" do
-    @conn.logoff.should be_true
-  end
-  
+
   # Ruby 1.8 and 1.9
-  if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  unless defined?(JRuby)
     describe "OCI data type conversions" do
       it "should translate PL/SQL VARCHAR2 to Ruby String" do
         @conn.plsql_to_ruby_data_type(:data_type => "VARCHAR2", :data_length => 100).should == [String, 100]
@@ -110,8 +114,9 @@ describe "Connection" do
       
     end
 
-  elsif RUBY_ENGINE == 'jruby'
-    
+  # JRuby
+  else
+
     describe "JDBC data type conversions" do
       it "should translate PL/SQL VARCHAR2 to Ruby String" do
         @conn.plsql_to_ruby_data_type(:data_type => "VARCHAR2", :data_length => 100).should == [String, 100]
@@ -123,7 +128,7 @@ describe "Connection" do
       end
       
       it "should translate PL/SQL DATE to Ruby DateTime" do
-        @conn.plsql_to_ruby_data_type(:data_type => "DATE", :data_length => nil).should == [Time, nil]
+        @conn.plsql_to_ruby_data_type(:data_type => "DATE", :data_length => nil).should == [DateTime, nil]
       end
       
       it "should translate PL/SQL TIMESTAMP to Ruby Time" do
@@ -138,12 +143,7 @@ describe "Connection" do
         big_decimal = @conn.ruby_value_to_ora_value(12345678901234567890, BigDecimal)
         big_decimal.should == java.math.BigDecimal.new("12345678901234567890")
       end
-      
-      # it "should translate Ruby OraDate value to DateTime when DateTime type specified" do
-      #   now = OraDate.now
-      #   @conn.ruby_value_to_ora_value(now, DateTime).should eql(now.to_datetime)
-      # end
-      
+
       it "should translate Ruby String value to Java::OracleSql::CLOB when Java::OracleSql::CLOB type specified" do
         large_text = "x" * 100_000
         ora_value = @conn.ruby_value_to_ora_value(large_text, Java::OracleSql::CLOB)
@@ -166,11 +166,6 @@ describe "Connection" do
       it "should translate Oracle BigDecimal float value to BigDecimal" do
         @conn.ora_value_to_ruby_value(BigDecimal("100.11")).should eql(BigDecimal("100.11"))
       end
-      
-      # it "should translate Oracle OraDate value to Time" do
-      #   now = OraDate.now
-      #   @conn.ora_value_to_ruby_value(now).should eql(now.to_time)
-      # end
 
       it "should translate Oracle CLOB value to String" do
         large_text = "āčē" * 100_000
@@ -185,8 +180,8 @@ describe "Connection" do
       end
 
     end
-    
-  end  
+
+  end
 
   describe "SQL SELECT statements" do
 
@@ -218,7 +213,7 @@ describe "Connection" do
         FROM dual").should == [nil,123,123.456,@now]
     end
 
-    if defined?(JRUBY_VERSION)
+    if defined?(JRuby)
 
       it "should execute SQL statement with NULL values as bind parameters and return first result" do
         @today = Date.parse("2008-05-31")
@@ -278,30 +273,30 @@ describe "Connection" do
   end
   
   describe "PL/SQL procedures" do
-    before(:each) do
+    before(:all) do
       @random = rand(1000)
       @now = Time.local(2008,05,31,23,22,11)
-      sql = <<-EOS
+      sql = <<-SQL
         CREATE OR REPLACE FUNCTION test_add_random (p_number NUMBER, p_varchar IN OUT VARCHAR2, p_date IN OUT DATE)
           RETURN NUMBER
         IS
         BEGIN
           RETURN p_number + #{@random};
         END test_add_random;
-      EOS
+      SQL
       @conn.exec(sql).should be_true
     end
 
-    after(:each) do
+    after(:all) do
       @conn.exec "DROP FUNCTION test_add_random"
     end
 
     it "should parse PL/SQL procedure call and bind parameters and exec and get bind parameter value" do
-      sql = <<-EOS
+      sql = <<-SQL
         BEGIN
           :result := test_add_random (:p_number, :p_varchar, :p_date);
         END;
-      EOS
+      SQL
       cursor = @conn.parse(sql)
       cursor.bind_param(":result", nil, :data_type => 'NUMBER', :in_out => 'OUT')
       cursor.bind_param(":p_number", 100, :data_type => 'NUMBER', :in_out => 'IN')
@@ -317,17 +312,21 @@ describe "Connection" do
   end
   
   describe "commit and rollback" do
-    before(:each) do
-      sql = "CREATE TABLE test_commit (dummy VARCHAR2(100))"
-      @conn.exec(sql).should be_true
+    before(:all) do
+      @conn.exec("CREATE TABLE test_commit (dummy VARCHAR2(100))").should be_true
       @conn.autocommit = false
       @conn.should_not be_autocommit
     end
+
+    after(:all) do
+      @conn.exec "DROP TABLE test_commit"
+    end
+
     after(:each) do
-      sql = "DROP TABLE test_commit"
-      @conn.exec(sql).should be_true      
+      @conn.exec "DELETE FROM test_commit"
+      @conn.commit
     end
-    
+
     it "should do commit" do
       @conn.exec("INSERT INTO test_commit VALUES ('test')")
       @conn.commit
@@ -349,4 +348,67 @@ describe "Connection" do
 
   end
 
+  describe "prefetch rows" do
+    after(:each) do
+      @conn.prefetch_rows = 1 # set back to default
+    end
+
+    it "should set prefetch rows for connection" do
+      sql = "SELECT 1 FROM dual UNION ALL SELECT 1/0 FROM dual"
+      @conn.prefetch_rows = 2
+      lambda {
+        @conn.cursor_from_query(sql)
+      }.should raise_error(/divisor is equal to zero/)
+      @conn.prefetch_rows = 1
+      lambda {
+        @conn.cursor_from_query(sql)
+      }.should_not raise_error
+    end
+
+    it "should fetch just one row when using select_first" do
+      sql = "SELECT 1 FROM dual UNION ALL SELECT 1/0 FROM dual"
+      @conn.prefetch_rows = 2
+      lambda {
+        @conn.select_first(sql)
+      }.should_not raise_error
+    end
+
+  end
+
+  describe "describe synonym" do
+    before(:all) do
+      @conn.exec "CREATE SYNONYM hr.synonym_for_dual FOR sys.dual"
+    end
+
+    after(:all) do
+      @conn.exec "DROP SYNONYM hr.synonym_for_dual"
+    end
+
+    it "should describe local synonym" do
+      @conn.describe_synonym('HR','SYNONYM_FOR_DUAL').should == ['SYS', 'DUAL']
+      @conn.describe_synonym('hr','synonym_for_dual').should == ['SYS', 'DUAL']
+      @conn.describe_synonym(:hr,:synonym_for_dual).should == ['SYS', 'DUAL']
+    end
+
+    it "should return nil on non-existing synonym" do
+      @conn.describe_synonym('HR','SYNONYM_FOR_XXX').should be_nil
+      @conn.describe_synonym('hr','synonym_for_xxx').should be_nil
+      @conn.describe_synonym(:hr,:synonym_for_xxx).should be_nil
+    end
+
+    it "should describe public synonym" do
+      @conn.describe_synonym('PUBLIC','DUAL').should == ['SYS', 'DUAL']
+      @conn.describe_synonym('PUBLIC','dual').should == ['SYS', 'DUAL']
+      @conn.describe_synonym('PUBLIC',:dual).should == ['SYS', 'DUAL']
+    end
+
+  end
+
+  describe "database version" do
+    it "should get database version" do
+      # using Oracle version 10.2.0.4 for unit tests
+      @conn.database_version.should == [10, 2]
+    end
+  end
+
 end

data/spec/plsql/package_spec.rb

@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe "Package" do
   before(:all) do
     plsql.connection = get_connection
-    plsql.connection.exec <<-EOS
+    plsql.execute <<-SQL
       CREATE OR REPLACE PACKAGE test_package IS
+        test_variable NUMBER;
         FUNCTION test_procedure ( p_string VARCHAR2 )
           RETURN VARCHAR2;
       END;
-    EOS
-    plsql.connection.exec <<-EOS
+    SQL
+    plsql.execute <<-SQL
       CREATE OR REPLACE PACKAGE BODY test_package IS
         FUNCTION test_procedure ( p_string VARCHAR2 )
           RETURN VARCHAR2
@@ -18,11 +19,12 @@ describe "Package" do
           RETURN UPPER(p_string);
         END test_procedure;
       END;
-    EOS
+    SQL
 
   end
   
   after(:all) do
+    plsql.execute "DROP PACKAGE test_package"
     plsql.logoff
   end
   
@@ -45,19 +47,26 @@ describe "Package" do
     plsql.test_package.test_procedure('xxx').should == 'XXX'
   end
 
+  describe "variables" do
+    it "should set and get package variable value" do
+      plsql.test_package.test_variable = 1
+      plsql.test_package.test_variable.should == 1
+    end
+  end
+
 end
 
 describe "Synonym to package" do
   
   before(:all) do
     plsql.connection = get_connection
-    plsql.connection.exec <<-EOS
+    plsql.execute <<-SQL
       CREATE OR REPLACE PACKAGE hr.test_package IS
         FUNCTION test_procedure ( p_string VARCHAR2 )
           RETURN VARCHAR2;
       END;
-    EOS
-    plsql.connection.exec <<-EOS
+    SQL
+    plsql.execute <<-SQL
       CREATE OR REPLACE PACKAGE BODY hr.test_package IS
         FUNCTION test_procedure ( p_string VARCHAR2 )
           RETURN VARCHAR2
@@ -66,12 +75,12 @@ describe "Synonym to package" do
           RETURN UPPER(p_string);
         END test_procedure;
       END;
-    EOS
-    plsql.connection.exec "CREATE SYNONYM test_pkg_synonym FOR hr.test_package"
+    SQL
+    plsql.execute "CREATE SYNONYM test_pkg_synonym FOR hr.test_package"
   end
   
   after(:all) do
-    plsql.connection.exec "DROP SYNONYM test_pkg_synonym" rescue nil
+    plsql.execute "DROP SYNONYM test_pkg_synonym" rescue nil
     plsql.logoff
   end
   

data/spec/plsql/procedure_spec.rb

@@ -14,7 +14,7 @@ describe "Parameter type mapping /" do
   describe "Function with string parameters" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_uppercase
           ( p_string VARCHAR2 )
           RETURN VARCHAR2
@@ -22,11 +22,11 @@ describe "Parameter type mapping /" do
         BEGIN
           RETURN UPPER(p_string);
         END test_uppercase;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_uppercase"
+      plsql.execute "DROP FUNCTION test_uppercase"
     end
   
     it "should find existing procedure" do
@@ -66,7 +66,7 @@ describe "Parameter type mapping /" do
   describe "Function with numeric parameters" do
   
     before(:all) do
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_sum
           ( p_num1 NUMBER, p_num2 NUMBER )
           RETURN NUMBER
@@ -75,7 +75,7 @@ describe "Parameter type mapping /" do
           RETURN p_num1 + p_num2;
         END test_sum;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_number_1
           ( p_num NUMBER )
           RETURN VARCHAR2
@@ -92,11 +92,21 @@ describe "Parameter type mapping /" do
           END IF;
         END test_number_1;
       SQL
+      plsql.execute <<-SQL
+        CREATE OR REPLACE PROCEDURE test_integers
+          ( p_pls_int PLS_INTEGER, p_bin_int BINARY_INTEGER, x_pls_int OUT PLS_INTEGER, x_bin_int OUT BINARY_INTEGER )
+        IS
+        BEGIN
+          x_pls_int := p_pls_int;
+          x_bin_int := p_bin_int;
+        END;
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_sum"
-      plsql.connection.exec "DROP FUNCTION test_number_1"
+      plsql.execute "DROP FUNCTION test_sum"
+      plsql.execute "DROP FUNCTION test_number_1"
+      plsql.execute "DROP PROCEDURE test_integers"
     end
   
     it "should process integer parameters" do
@@ -127,12 +137,15 @@ describe "Parameter type mapping /" do
       plsql.test_number_1(false).should == 'N'
     end
 
+    it "should process binary integer parameters" do
+      plsql.test_integers(123, 456).should == {:x_pls_int => 123, :x_bin_int => 456}
+    end
   end
 
   describe "Function with date parameters" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_date
           ( p_date DATE )
           RETURN DATE
@@ -140,7 +153,7 @@ describe "Parameter type mapping /" do
         BEGIN
           RETURN p_date + 1;
         END test_date;
-      EOS
+      SQL
     end
   
     before(:each) do
@@ -148,7 +161,7 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_date"
+      plsql.execute "DROP FUNCTION test_date"
     end
   
     it "should process Time parameters" do
@@ -199,7 +212,7 @@ describe "Parameter type mapping /" do
   describe "Function with timestamp parameters" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_timestamp
           ( p_time TIMESTAMP )
           RETURN TIMESTAMP
@@ -207,11 +220,11 @@ describe "Parameter type mapping /" do
         BEGIN
           RETURN p_time + NUMTODSINTERVAL(1, 'DAY');
         END test_timestamp;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_timestamp"
+      plsql.execute "DROP FUNCTION test_timestamp"
     end
   
     it "should process timestamp parameters" do
@@ -224,7 +237,7 @@ describe "Parameter type mapping /" do
 
   describe "Procedure with output parameters" do
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_copy
           ( p_from VARCHAR2, p_to OUT VARCHAR2, p_to_double OUT VARCHAR2 )
         IS
@@ -232,11 +245,11 @@ describe "Parameter type mapping /" do
           p_to := p_from;
           p_to_double := p_from || p_from;
         END test_copy;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP PROCEDURE test_copy"
+      plsql.execute "DROP PROCEDURE test_copy"
     end
   
     it "should return hash with output parameters" do
@@ -259,7 +272,7 @@ describe "Parameter type mapping /" do
 
   describe "Package with procedures with same name but different argument lists" do
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE test_package2 IS
           FUNCTION test_procedure ( p_string VARCHAR2 )
             RETURN VARCHAR2;
@@ -270,8 +283,8 @@ describe "Parameter type mapping /" do
           FUNCTION test_procedure2 ( p_string VARCHAR2 )
             RETURN VARCHAR2;
         END;
-      EOS
-      plsql.connection.exec <<-EOS
+      SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE BODY test_package2 IS
           FUNCTION test_procedure ( p_string VARCHAR2 )
             RETURN VARCHAR2
@@ -296,12 +309,12 @@ describe "Parameter type mapping /" do
             RETURN UPPER(p_string);
           END test_procedure2;
         END;
-      EOS
+      SQL
 
     end
   
     after(:all) do
-      plsql.connection.exec "DROP PACKAGE test_package2"
+      plsql.execute "DROP PACKAGE test_package2"
     end
     
     it "should find existing package" do
@@ -347,7 +360,7 @@ describe "Parameter type mapping /" do
 
   describe "Function with output parameters" do
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_function
           ( p_from VARCHAR2, p_to OUT VARCHAR2, p_to_double OUT VARCHAR2 )
           RETURN NUMBER
@@ -357,11 +370,11 @@ describe "Parameter type mapping /" do
           p_to_double := p_from || p_from;
           RETURN LENGTH(p_from);
         END test_copy_function;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_copy_function"
+      plsql.execute "DROP FUNCTION test_copy_function"
     end
   
     it "should return array with return value and hash of output parameters" do
@@ -381,26 +394,26 @@ describe "Parameter type mapping /" do
 
   describe "Function or procedure without parameters" do
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_no_params
           RETURN VARCHAR2
         IS
         BEGIN
           RETURN 'dummy';
         END test_no_params;
-      EOS
-      plsql.connection.exec <<-EOS
+      SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_proc_no_params
         IS
         BEGIN
           NULL;
         END test_proc_no_params;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_no_params"
-      plsql.connection.exec "DROP PROCEDURE test_proc_no_params"
+      plsql.execute "DROP FUNCTION test_no_params"
+      plsql.execute "DROP PROCEDURE test_proc_no_params"
     end
 
     it "should find function" do
@@ -424,7 +437,7 @@ describe "Parameter type mapping /" do
   describe "Function with CLOB parameter and return value" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_clob
           ( p_clob CLOB )
           RETURN CLOB
@@ -432,11 +445,11 @@ describe "Parameter type mapping /" do
         BEGIN
           RETURN p_clob;
         END test_clob;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_clob"
+      plsql.execute "DROP FUNCTION test_clob"
     end
   
     it "should find existing procedure" do
@@ -473,7 +486,7 @@ describe "Parameter type mapping /" do
   describe "Procedrue with CLOB parameter and return value" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_clob_proc
           ( p_clob CLOB,
             p_return OUT CLOB)
@@ -481,11 +494,11 @@ describe "Parameter type mapping /" do
         BEGIN
           p_return := p_clob;
         END test_clob_proc;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP PROCEDURE test_clob_proc"
+      plsql.execute "DROP PROCEDURE test_clob_proc"
     end
   
     it "should find existing procedure" do
@@ -501,7 +514,7 @@ describe "Parameter type mapping /" do
   describe "Procedrue with BLOB parameter and return value" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_blob_proc
           ( p_blob BLOB,
             p_return OUT BLOB)
@@ -509,11 +522,11 @@ describe "Parameter type mapping /" do
         BEGIN
           p_return := p_blob;
         END test_blob_proc;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP PROCEDURE test_blob_proc"
+      plsql.execute "DROP PROCEDURE test_blob_proc"
     end
   
     it "should find existing procedure" do
@@ -529,8 +542,8 @@ describe "Parameter type mapping /" do
   describe "Function with record parameter" do
 
     before(:all) do
-      plsql.connection.exec "DROP TABLE test_employees" rescue nil
-      plsql.connection.exec <<-SQL
+      plsql.execute "DROP TABLE test_employees" rescue nil
+      plsql.execute <<-SQL
         CREATE TABLE test_employees (
           employee_id   NUMBER(15),
           first_name    VARCHAR2(50),
@@ -538,7 +551,7 @@ describe "Parameter type mapping /" do
           hire_date     DATE
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_full_name (p_employee test_employees%ROWTYPE)
           RETURN VARCHAR2
         IS
@@ -546,7 +559,7 @@ describe "Parameter type mapping /" do
           RETURN p_employee.first_name || ' ' || p_employee.last_name;
         END test_full_name;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_employee_record (p_employee test_employees%ROWTYPE)
           RETURN test_employees%ROWTYPE
         IS
@@ -554,7 +567,7 @@ describe "Parameter type mapping /" do
           RETURN p_employee;
         END test_employee_record;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_employee_record2 (p_employee test_employees%ROWTYPE, x_employee OUT test_employees%ROWTYPE)
           RETURN test_employees%ROWTYPE
         IS
@@ -581,10 +594,10 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_full_name"
-      plsql.connection.exec "DROP FUNCTION test_employee_record"
-      plsql.connection.exec "DROP FUNCTION test_employee_record2"
-      plsql.connection.exec "DROP TABLE test_employees"
+      plsql.execute "DROP FUNCTION test_full_name"
+      plsql.execute "DROP FUNCTION test_employee_record"
+      plsql.execute "DROP FUNCTION test_employee_record2"
+      plsql.execute "DROP TABLE test_employees"
     end
 
     it "should find existing function" do
@@ -622,7 +635,7 @@ describe "Parameter type mapping /" do
   describe "Function with boolean parameters" do
 
     before(:all) do
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_boolean
           ( p_boolean BOOLEAN )
           RETURN BOOLEAN
@@ -631,7 +644,7 @@ describe "Parameter type mapping /" do
           RETURN p_boolean;
         END test_boolean;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_boolean2
             ( p_boolean BOOLEAN, x_boolean OUT BOOLEAN )
         IS
@@ -642,8 +655,8 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_boolean"
-      plsql.connection.exec "DROP PROCEDURE test_boolean2"
+      plsql.execute "DROP FUNCTION test_boolean"
+      plsql.execute "DROP PROCEDURE test_boolean2"
     end
 
     it "should accept true value and return true value" do
@@ -675,25 +688,25 @@ describe "Parameter type mapping /" do
   describe "Function with object type parameter" do
 
     before(:all) do
-      plsql.connection.exec "DROP TYPE t_employee" rescue nil
-      plsql.connection.exec "DROP TYPE t_phones" rescue nil
-      plsql.connection.exec <<-SQL
+      plsql.execute "DROP TYPE t_employee" rescue nil
+      plsql.execute "DROP TYPE t_phones" rescue nil
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_address AS OBJECT (
           street    VARCHAR2(50),
           city      VARCHAR2(50),
           country   VARCHAR2(50)
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phone AS OBJECT (
           type            VARCHAR2(10),
           phone_number    VARCHAR2(50)
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phones AS TABLE OF T_PHONE
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_employee AS OBJECT (
           employee_id   NUMBER(15),
           first_name    VARCHAR2(50),
@@ -703,7 +716,7 @@ describe "Parameter type mapping /" do
           phones        t_phones
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_full_name (p_employee t_employee)
           RETURN VARCHAR2
         IS
@@ -711,7 +724,7 @@ describe "Parameter type mapping /" do
           RETURN p_employee.first_name || ' ' || p_employee.last_name;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_employee_object (p_employee t_employee)
           RETURN t_employee
         IS
@@ -719,7 +732,7 @@ describe "Parameter type mapping /" do
           RETURN p_employee;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_employee_object2 (p_employee t_employee, x_employee OUT t_employee)
           RETURN t_employee
         IS
@@ -739,13 +752,13 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_full_name"
-      plsql.connection.exec "DROP FUNCTION test_employee_object"
-      plsql.connection.exec "DROP FUNCTION test_employee_object2"
-      plsql.connection.exec "DROP TYPE t_employee"
-      plsql.connection.exec "DROP TYPE t_address"
-      plsql.connection.exec "DROP TYPE t_phones"
-      plsql.connection.exec "DROP TYPE t_phone"
+      plsql.execute "DROP FUNCTION test_full_name"
+      plsql.execute "DROP FUNCTION test_employee_object"
+      plsql.execute "DROP FUNCTION test_employee_object2"
+      plsql.execute "DROP TYPE t_employee"
+      plsql.execute "DROP TYPE t_address"
+      plsql.execute "DROP TYPE t_phones"
+      plsql.execute "DROP TYPE t_phone"
     end
 
     it "should find existing function" do
@@ -781,10 +794,10 @@ describe "Parameter type mapping /" do
 
     before(:all) do
       # Array of numbers
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_numbers AS TABLE OF NUMBER(15)
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_sum (p_numbers IN t_numbers)
           RETURN NUMBER
         IS
@@ -803,7 +816,7 @@ describe "Parameter type mapping /" do
         END;
       SQL
 
-      plsql.connection.exec <<-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
         IS
@@ -820,10 +833,10 @@ describe "Parameter type mapping /" do
       SQL
 
       # Array of strings
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_strings AS TABLE OF VARCHAR2(4000)
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_strings(p_strings IN t_strings, x_strings OUT t_strings)
           RETURN t_strings
         IS
@@ -840,14 +853,14 @@ describe "Parameter type mapping /" do
       SQL
 
       # Wrong type definition inside package
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE test_collections IS
           TYPE t_numbers IS TABLE OF NUMBER(15);
           FUNCTION test_sum (p_numbers IN t_numbers)
             RETURN NUMBER;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE BODY test_collections IS
           FUNCTION test_sum (p_numbers IN t_numbers)
           RETURN NUMBER
@@ -869,16 +882,16 @@ describe "Parameter type mapping /" do
       SQL
 
       # Array of objects
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phone AS OBJECT (
           type            VARCHAR2(10),
           phone_number    VARCHAR2(50)
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phones AS TABLE OF T_PHONE
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_objects(p_phones IN t_phones, x_phones OUT t_phones)
           RETURN t_phones
         IS
@@ -890,15 +903,15 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_sum"
-      plsql.connection.exec "DROP FUNCTION test_increment"
-      plsql.connection.exec "DROP FUNCTION test_copy_strings"
-      plsql.connection.exec "DROP PACKAGE test_collections"
-      plsql.connection.exec "DROP FUNCTION test_copy_objects"
-      plsql.connection.exec "DROP TYPE t_numbers"
-      plsql.connection.exec "DROP TYPE t_strings"
-      plsql.connection.exec "DROP TYPE t_phones"
-      plsql.connection.exec "DROP TYPE t_phone"
+      plsql.execute "DROP FUNCTION test_sum"
+      plsql.execute "DROP FUNCTION test_increment"
+      plsql.execute "DROP FUNCTION test_copy_strings"
+      plsql.execute "DROP PACKAGE test_collections"
+      plsql.execute "DROP FUNCTION test_copy_objects"
+      plsql.execute "DROP TYPE t_numbers"
+      plsql.execute "DROP TYPE t_strings"
+      plsql.execute "DROP TYPE t_phones"
+      plsql.execute "DROP TYPE t_phone"
     end
 
     it "should find existing function" do
@@ -940,10 +953,10 @@ describe "Parameter type mapping /" do
 
     before(:all) do
       # Array of numbers
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_numbers_array AS VARRAY(100) OF NUMBER(15)
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_sum (p_numbers IN t_numbers_array)
           RETURN NUMBER
         IS
@@ -960,7 +973,7 @@ describe "Parameter type mapping /" do
         END;
       SQL
     
-      plsql.connection.exec <<-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
         IS
@@ -975,10 +988,10 @@ describe "Parameter type mapping /" do
       SQL
     
       # Array of strings
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_strings_array AS VARRAY(100) OF VARCHAR2(4000)
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_strings(p_strings IN t_strings_array, x_strings OUT t_strings_array)
           RETURN t_strings_array
         IS
@@ -993,17 +1006,17 @@ describe "Parameter type mapping /" do
       SQL
 
       # Array of objects
-      plsql.connection.exec "DROP TYPE t_phones_array" rescue nil
-      plsql.connection.exec <<-SQL
+      plsql.execute "DROP TYPE t_phones_array" rescue nil
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phone AS OBJECT (
           type            VARCHAR2(10),
           phone_number    VARCHAR2(50)
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE TYPE t_phones_array AS ARRAY(100) OF T_PHONE
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_copy_objects(p_phones IN t_phones_array, x_phones OUT t_phones_array)
           RETURN t_phones_array
         IS
@@ -1015,14 +1028,14 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_sum"
-      plsql.connection.exec "DROP FUNCTION test_increment"
-      plsql.connection.exec "DROP FUNCTION test_copy_strings"
-      plsql.connection.exec "DROP FUNCTION test_copy_objects"
-      plsql.connection.exec "DROP TYPE t_numbers_array"
-      plsql.connection.exec "DROP TYPE t_strings_array"
-      plsql.connection.exec "DROP TYPE t_phones_array"
-      plsql.connection.exec "DROP TYPE t_phone"
+      plsql.execute "DROP FUNCTION test_sum"
+      plsql.execute "DROP FUNCTION test_increment"
+      plsql.execute "DROP FUNCTION test_copy_strings"
+      plsql.execute "DROP FUNCTION test_copy_objects"
+      plsql.execute "DROP TYPE t_numbers_array"
+      plsql.execute "DROP TYPE t_strings_array"
+      plsql.execute "DROP TYPE t_phones_array"
+      plsql.execute "DROP TYPE t_phone"
     end
 
     it "should find existing function" do
@@ -1057,8 +1070,8 @@ describe "Parameter type mapping /" do
   describe "Function with cursor return value or parameter" do
 
     before(:all) do
-      plsql.connection.exec "DROP TABLE test_employees" rescue nil
-      plsql.connection.exec <<-SQL
+      plsql.execute "DROP TABLE test_employees" rescue nil
+      plsql.execute <<-SQL
         CREATE TABLE test_employees (
           employee_id   NUMBER(15),
           first_name    VARCHAR2(50),
@@ -1066,7 +1079,7 @@ describe "Parameter type mapping /" do
           hire_date     DATE
         )
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_insert_employee(p_employee test_employees%ROWTYPE)
         IS
         BEGIN
@@ -1074,7 +1087,7 @@ describe "Parameter type mapping /" do
           VALUES p_employee;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_cursor
           RETURN SYS_REFCURSOR
         IS
@@ -1085,7 +1098,7 @@ describe "Parameter type mapping /" do
           RETURN l_cursor;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE PROCEDURE test_cursor_out(x_cursor OUT SYS_REFCURSOR)
         IS
         BEGIN
@@ -1093,7 +1106,7 @@ describe "Parameter type mapping /" do
           SELECT * FROM test_employees ORDER BY employee_id;
         END;
       SQL
-      plsql.connection.exec <<-SQL
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION test_cursor_fetch(p_cursor SYS_REFCURSOR)
           RETURN test_employees%ROWTYPE
         IS
@@ -1119,11 +1132,11 @@ describe "Parameter type mapping /" do
     end
 
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION test_cursor"
-      plsql.connection.exec "DROP PROCEDURE test_cursor_out"
-      plsql.connection.exec "DROP PROCEDURE test_insert_employee"
-      plsql.connection.exec "DROP FUNCTION test_cursor_fetch"
-      plsql.connection.exec "DROP TABLE test_employees"
+      plsql.execute "DROP FUNCTION test_cursor"
+      plsql.execute "DROP PROCEDURE test_cursor_out"
+      plsql.execute "DROP PROCEDURE test_insert_employee"
+      plsql.execute "DROP FUNCTION test_cursor_fetch"
+      plsql.execute "DROP TABLE test_employees"
     end
 
     it "should find existing function" do
@@ -1211,7 +1224,7 @@ describe "Synonyms /" do
   describe "Local synonym to function" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION hr.test_uppercase
           ( p_string VARCHAR2 )
           RETURN VARCHAR2
@@ -1219,13 +1232,13 @@ describe "Synonyms /" do
         BEGIN
           RETURN UPPER(p_string);
         END test_uppercase;
-      EOS
-      plsql.connection.exec "CREATE SYNONYM test_synonym FOR hr.test_uppercase"
+      SQL
+      plsql.execute "CREATE SYNONYM test_synonym FOR hr.test_uppercase"
     end
   
     after(:all) do
-      plsql.connection.exec "DROP SYNONYM test_synonym"
-      plsql.connection.exec "DROP FUNCTION hr.test_uppercase"
+      plsql.execute "DROP SYNONYM test_synonym"
+      plsql.execute "DROP FUNCTION hr.test_uppercase"
     end
   
     it "should find synonym to function" do
@@ -1241,18 +1254,18 @@ describe "Synonyms /" do
   describe "Public synonym to function" do
   
     before(:all) do
-      plsql.connection.exec <<-EOS
+      plsql.execute <<-SQL
         CREATE OR REPLACE FUNCTION hr.test_ora_login_user
           RETURN VARCHAR2
         IS
         BEGIN
           RETURN 'XXX';
         END test_ora_login_user;
-      EOS
+      SQL
     end
   
     after(:all) do
-      plsql.connection.exec "DROP FUNCTION hr.test_ora_login_user"
+      plsql.execute "DROP FUNCTION hr.test_ora_login_user"
     end
   
     it "should find public synonym to function" do
@@ -1263,13 +1276,17 @@ describe "Synonyms /" do
       plsql.ora_login_user.should == 'HR'
     end
 
+    it "should not find public synonym if schema prefix is used" do
+      lambda { plsql.hr.ora_login_user }.should raise_error(ArgumentError)
+    end
+
     it "should find private synonym before public synonym" do
       # should reconnect to force clearing of procedure cache
       plsql.connection = get_connection
-      plsql.connection.exec "DROP SYNONYM ora_login_user" rescue nil
-      plsql.connection.exec "CREATE SYNONYM ora_login_user FOR hr.test_ora_login_user"
+      plsql.execute "DROP SYNONYM ora_login_user" rescue nil
+      plsql.execute "CREATE SYNONYM ora_login_user FOR hr.test_ora_login_user"
       plsql.ora_login_user.should == 'XXX'
-      plsql.connection.exec "DROP SYNONYM ora_login_user"
+      plsql.execute "DROP SYNONYM ora_login_user"
       plsql.connection = get_connection
       plsql.ora_login_user.should == 'HR'
     end
@@ -1277,3 +1294,19 @@ describe "Synonyms /" do
   end
 
 end
+
+describe "SYS.STANDARD procedures /" do
+
+  before(:all) do
+    plsql.connection = get_connection
+  end
+
+  after(:all) do
+    plsql.logoff
+  end
+
+  it "should execute function from SYS.STANDARD package" do
+    plsql.upper('abc').should == 'ABC'
+  end
+
+end