ruby-plsql 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.6 2008-06-16
+
+* Improvements
+  * If PL/SQL functions with output parameters are called then the result will be array with the function return value as a first element
+    and a hash with output parameters values as a second element.
+
 == 0.1.5 2008-06-13
 
 * Bug fixes

data/lib/plsql/procedure.rb

@@ -155,8 +155,14 @@ module PLSQL
       
       cursor.exec
 
-      # if function
-      if @return[overload]
+      # if function with output parameters
+      if @return[overload] && @out_list[overload].size > 0
+        result = [ora_value_to_ruby_value(cursor[':return']), {}]
+        @out_list[overload].each do |k|
+          result[1][k] = ora_value_to_ruby_value(cursor[":#{k}"])
+        end
+      # if function without output parameters
+      elsif @return[overload]
         result = ora_value_to_ruby_value(cursor[':return'])
       # if procedure with output parameters
       elsif @out_list[overload].size > 0

data/lib/ruby_plsql/version.rb

@@ -2,7 +2,7 @@ module RubyPlsql #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/plsql/procedure_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require "rubygems"
 require "activerecord"
 
-describe "Procedure with string parameters" do
+describe "Function with string parameters" do
   
   before(:all) do
     plsql.connection = conn = OCI8.new("hr","hr","xe")
@@ -56,7 +56,7 @@ describe "Procedure with string parameters" do
 
 end
 
-describe "Procedure with numeric parameters" do
+describe "Function with numeric parameters" do
   
   before(:all) do
     plsql.connection = conn = OCI8.new("hr","hr","xe")
@@ -97,7 +97,7 @@ describe "Procedure with numeric parameters" do
 
 end
 
-describe "Procedure with date parameters" do
+describe "Function with date parameters" do
   
   before(:all) do
     plsql.connection = conn = OCI8.new("hr","hr","xe")
@@ -142,7 +142,7 @@ describe "Procedure with date parameters" do
 
 end
 
-describe "Procedure with timestamp parameters" do
+describe "Function with timestamp parameters" do
   
   before(:all) do
     plsql.connection = conn = OCI8.new("hr","hr","xe")
@@ -186,11 +186,11 @@ describe "Procedure with output parameters" do
     plsql.logoff
   end
   
-  it "should return array with output parameters" do
+  it "should return hash with output parameters" do
     plsql.test_copy("abc", nil, nil).should == { :p_to => "abc", :p_to_double => "abcabc" }
   end
 
-  it "should return array with output parameters when called with named parameters" do
+  it "should return hash with output parameters when called with named parameters" do
     plsql.test_copy(:p_from => "abc", :p_to => nil, :p_to_double => nil).should == { :p_to => "abc", :p_to_double => "abcabc" }
   end
 
@@ -292,3 +292,64 @@ describe "Package with procedures with same name but different argument lists" d
   end
 
 end
+
+describe "Function with output parameters" do
+  before(:all) do
+    plsql.connection = conn = OCI8.new("hr","hr","xe")
+    plsql.connection.exec <<-EOS
+      CREATE OR REPLACE FUNCTION test_copy_function
+        ( p_from VARCHAR2, p_to OUT VARCHAR2, p_to_double OUT VARCHAR2 )
+        RETURN NUMBER
+      IS
+      BEGIN
+        p_to := p_from;
+        p_to_double := p_from || p_from;
+        RETURN LENGTH(p_from);
+      END test_copy_function;
+    EOS
+  end
+  
+  after(:all) do
+    plsql.logoff
+  end
+  
+  it "should return array with return value and hash of output parameters" do
+    plsql.test_copy_function("abc", nil, nil).should == [3, { :p_to => "abc", :p_to_double => "abcabc" }]
+  end
+
+  it "should return array with return value and hash of output parameters when called with named parameters" do
+    plsql.test_copy_function(:p_from => "abc", :p_to => nil, :p_to_double => nil).should == 
+      [3, { :p_to => "abc", :p_to_double => "abcabc" }]
+  end
+
+  it "should substitute output parameters with nil if they are not specified" do
+    plsql.test_copy_function("abc").should == [3, { :p_to => "abc", :p_to_double => "abcabc" }]
+  end
+
+  it "should substitute all parementers with nil if none are specified" do
+    plsql.test_copy_function.should == [nil, { :p_to => nil, :p_to_double => nil }]
+  end
+
+end
+
+describe "Function without parameters" do
+  before(:all) do
+    plsql.connection = conn = OCI8.new("hr","hr","xe")
+    plsql.connection.exec <<-EOS
+      CREATE OR REPLACE FUNCTION test_no_params
+        RETURN VARCHAR2
+      IS
+      BEGIN
+        RETURN 'dummy';
+      END test_no_params;
+    EOS
+  end
+  
+  after(:all) do
+    plsql.logoff
+  end
+
+  it "should return value" do
+    plsql.test_no_params.should == "dummy"
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Ruby API for PL/SQL</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ruby-plsql"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ruby-plsql" class="numbers">0.1.5</a>
+      <a href="http://rubyforge.org/projects/ruby-plsql" class="numbers">0.1.6</a>
     </div>
     <h1>&#x2192; &#8216;ruby-plsql&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plsql
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-15 00:00:00 +03:00
+date: 2008-06-26 00:00:00 +03:00
 default_executable: 
 dependencies: []