ruby-plsql 0.4.2 → 0.4.3

data/History.txt

@@ -1,3 +1,13 @@
+== 0.4.3 2010-03-25
+
+* Improvements
+  * plsql.connection.database_version will return also update and patch components of version number
+  * :column => :is_null and :column => :is_not_null conditions in table select operations
+* Bug fixes
+  * Bugfix for calling procedure with table of records type (defined inside package) output parameter
+  * Use subprogram_id column in all_arguments view only if database version is >= 10.2.0.2
+  * Support partial list of named arguments for overloaded procedures (assuming that missing arguments will have default value)
+
 == 0.4.2 2010-02-26
 
 * New features

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/plsql/jdbc_connection.rb

@@ -492,7 +492,17 @@ module PLSQL
     end
 
     def database_version
-      @database_version ||= (md = raw_connection.getMetaData) && [md.getDatabaseMajorVersion, md.getDatabaseMinorVersion]
+      @database_version ||= if md = raw_connection.getMetaData
+        major = md.getDatabaseMajorVersion
+        minor = md.getDatabaseMinorVersion
+        if md.getDatabaseProductVersion =~ /#{major}\.#{minor}\.(\d+)\.(\d+)/
+          update = $1.to_i
+          patch = $2.to_i
+        else
+          update = patch = 0
+        end
+        [major, minor, update, patch]
+      end
     end
 
     private

data/lib/plsql/oci_connection.rb

@@ -282,7 +282,8 @@ module PLSQL
     end
 
     def database_version
-      @database_version ||= (version = raw_connection.oracle_server_version) && [version.major, version.minor]
+      @database_version ||= (version = raw_connection.oracle_server_version) && 
+        [version.major, version.minor, version.update, version.patch]
     end
 
     private

data/lib/plsql/procedure.rb

@@ -82,7 +82,7 @@ module PLSQL
       @tmp_tables_created = {}
 
       # subprogram_id column is available just from version 10g
-      subprogram_id_column = (@schema.connection.database_version <=> [10, 2]) >= 0 ? 'subprogram_id' : 'NULL'
+      subprogram_id_column = (@schema.connection.database_version <=> [10, 2, 0, 2]) >= 0 ? 'subprogram_id' : 'NULL'
 
       @schema.select_all(
         "SELECT #{subprogram_id_column}, object_name, TO_NUMBER(overload), argument_name, position, data_level,

data/lib/plsql/procedure_call.rb

@@ -49,12 +49,19 @@ module PLSQL
         args_keys = args[0].keys
         # implicit SELF argument for object instance procedures
         args_keys << :self if @self && !args_keys.include?(:self)
-        args_keys = args_keys.sort_by{|k| k.to_s}
         number_of_args = args_keys.size
-        overload = overload_argument_list.keys.detect do |ov|
-          overload_argument_list[ov].size == number_of_args &&
-          overload_arguments[ov].keys.sort_by{|k| k.to_s} == args_keys
+        matching_overloads = [] # overloads with exact or smaller number of matching named arguments
+        overload_argument_list.keys.each do |ov|
+          # assume that missing arguments have default value
+          missing_arguments_count = overload_argument_list[ov].size - number_of_args
+          if missing_arguments_count >= 0 &&
+              args_keys.all?{|k| overload_argument_list[ov].include?(k)}
+            matching_overloads << [ov, missing_arguments_count]
+          end
         end
+        # pick first matching overload with smallest missing arguments count
+        # (hoping that missing arguments will be defaulted - cannot find default value from all_arguments)
+        overload = matching_overloads.sort_by{|ov, score| score}[0][0]
       # otherwise try matching by sequential arguments count and types
       else
         number_of_args = args.size
@@ -69,7 +76,7 @@ module PLSQL
           matching_types << matching_oracle_types_for_ruby_value(arg)
         end
         exact_overloads = [] # overloads with exact number of matching arguments
-        smaller_overloads = [] # overloads with exact number of matching arguments
+        smaller_overloads = [] # overloads with smaller number of matching arguments
         # overload = overload_argument_list.keys.detect do |ov|
         #   overload_argument_list[ov].size == number_of_args
         # end
@@ -399,7 +406,7 @@ module PLSQL
       case argument_metadata[:element][:data_type]
       when 'PL/SQL RECORD'
         field_names = record_fields_sorted_by_position(argument_metadata[:element][:fields])
-        values_string = field_names.map{|f| "l_return(i__).#{f}"}.join(', ')
+        values_string = field_names.map{|f| "l_#{argument}(i__).#{f}"}.join(', ')
         @return_sql << "INSERT INTO #{argument_metadata[:tmp_table_name]} VALUES (#{values_string}, i__);\n"
         return_fields_string = is_index_by_table ? '*' : field_names.join(', ')
       else
@@ -534,7 +541,7 @@ module PLSQL
       if @dbms_output_stream
         dbms_output_enable_sql = "DBMS_OUTPUT.ENABLE(#{@schema.dbms_output_buffer_size});\n"
         # if database version is at least 10.2 then use DBMS_OUTPUT.GET_LINES with SYS.DBMSOUTPUT_LINESARRAY
-        if (@schema.connection.database_version <=> [10, 2]) >= 0
+        if (@schema.connection.database_version <=> [10, 2, 0, 0]) >= 0
           @declare_sql << "l_dbms_output_numlines INTEGER := #{Schema::DBMS_OUTPUT_MAX_LINES};\n"
           dbms_output_get_sql = "DBMS_OUTPUT.GET_LINES(:dbms_output_lines, l_dbms_output_numlines);\n"
           @bind_values[:dbms_output_lines] = nil

data/lib/plsql/table.rb

@@ -105,8 +105,10 @@ module PLSQL
         sql_params.each do |k,v|
           if k == :order_by
             order_by_sql = " ORDER BY #{v} "
-          elsif v.nil?
+          elsif v.nil? || v == :is_null
             where_sqls << "#{k} IS NULL"
+          elsif v == :is_not_null
+            where_sqls << "#{k} IS NOT NULL"
           else
             where_sqls << "#{k} = :#{k}"
             bindvars << v

data/spec/plsql/connection_spec.rb

@@ -407,7 +407,7 @@ describe "Connection" do
   describe "session information" do
     it "should get database version" do
       # using Oracle version 10.2.0.4 for unit tests
-      @conn.database_version.should == [10, 2]
+      @conn.database_version.should == [10, 2, 0, 4]
     end
 
     it "should get session ID" do

data/spec/plsql/procedure_spec.rb

@@ -282,6 +282,10 @@ describe "Parameter type mapping /" do
             ;
           FUNCTION test_procedure2 ( p_string VARCHAR2 )
             RETURN VARCHAR2;
+          FUNCTION test_function ( p_string VARCHAR2, p_string2 VARCHAR2 DEFAULT ' ')
+            RETURN VARCHAR2;
+          FUNCTION test_function ( p_number NUMBER, p_number2 NUMBER DEFAULT 1 )
+            RETURN NUMBER;
         END;
       SQL
       plsql.execute <<-SQL
@@ -308,6 +312,18 @@ describe "Parameter type mapping /" do
           BEGIN
             RETURN UPPER(p_string);
           END test_procedure2;
+          FUNCTION test_function ( p_string VARCHAR2, p_string2 VARCHAR2)
+            RETURN VARCHAR2
+          IS
+          BEGIN
+            RETURN p_string||p_string2;
+          END;
+          FUNCTION test_function ( p_number NUMBER, p_number2 NUMBER)
+            RETURN NUMBER
+          IS
+          BEGIN
+            RETURN p_number + p_number2;
+          END;
         END;
       SQL
 
@@ -355,6 +371,11 @@ describe "Parameter type mapping /" do
       plsql.test_package2.test_procedure(:p_number => 111, :p_result => nil).should == {:p_result => '111'}
     end
 
+    it "should find matching procedure based on partial list of named arguments" do
+      plsql.test_package2.test_function(:p_string => 'xxx').should == 'xxx '
+      plsql.test_package2.test_function(:p_number => 1).should == 2
+    end
+
   end
 
   describe "Function with output parameters" do
@@ -1097,6 +1118,7 @@ describe "Parameter type mapping /" do
             INDEX BY BINARY_INTEGER;
           FUNCTION test_employees (p_employees IN OUT t_employees)
             RETURN t_employees;
+          PROCEDURE test_employees_prc (p_employees IN OUT t_employees);
           PROCEDURE insert_employees(p_employees IN t_employees);
         END;
       SQL
@@ -1133,6 +1155,11 @@ describe "Parameter type mapping /" do
           BEGIN
             RETURN p_employees;
           END;
+          PROCEDURE test_employees_prc (p_employees IN OUT t_employees)
+          IS
+          BEGIN
+            NULL;
+          END;
           PROCEDURE insert_employees(p_employees IN t_employees) IS
           BEGIN
             FORALL i IN p_employees.FIRST..p_employees.LAST
@@ -1181,6 +1208,10 @@ describe "Parameter type mapping /" do
       plsql.test_collections.test_employees(@employees).should == [@employees, {:p_employees => @employees}]
     end
 
+    it "should execute procedure with index-by table of records type (defined inside package) parameter" do
+      plsql.test_collections.test_employees_prc(@employees).should == {:p_employees => @employees}
+    end
+
     it "should create temporary tables in autonomous transaction" do
       old_autocommit = plsql.connection.autocommit?
       plsql.connection.autocommit = false
@@ -1196,7 +1227,7 @@ describe "Parameter type mapping /" do
       before(:all) do
         # simulate Oracle 9.2 connection
         plsql(:oracle_9).connection = get_connection
-        plsql(:oracle_9).connection.stub!(:database_version).and_return([9, 2])
+        plsql(:oracle_9).connection.stub!(:database_version).and_return([9, 2, 0, 0])
       end
 
       after(:all) do

data/spec/plsql/schema_spec.rb

@@ -269,7 +269,7 @@ describe "DBMS_OUTPUT logging" do
     end
 
     it "should log output when database version is less than 10.2" do
-      plsql.connection.stub!(:database_version).and_return([9, 2])
+      plsql.connection.stub!(:database_version).and_return([9, 2, 0, 0])
       times = 2_000
       plsql.test_dbms_output_large("1234567890", times)
       @buffer.string.should == "DBMS_OUTPUT: 1234567890\n" * times

data/spec/plsql/table_spec.rb

@@ -272,12 +272,12 @@ describe "Table" do
       plsql.test_employees.first(:employee_id => @employees.first[:employee_id]).should == @employees.first
     end
 
-    it "should select records in table using WHERE condition and ORBER BY sorting" do
+    it "should select records in table using WHERE condition and ORDER BY sorting" do
       plsql.test_employees.all(:employee_id => @employees.first[:employee_id], :order_by => :employee_id).should == [@employees.first]
     end
 
     it "should select record in table using :column => nil condition" do
-      employee = @employees.last
+      employee = @employees.last.dup
       employee[:employee_id] = employee[:employee_id] + 1
       employee[:hire_date] = nil
       plsql.test_employees.insert employee
@@ -285,6 +285,22 @@ describe "Table" do
       plsql.test_employees.first(:hire_date => nil).should == employee
     end
 
+    it "should select record in table using :column => :is_null condition" do
+      employee = @employees.last.dup
+      employee[:employee_id] = employee[:employee_id] + 1
+      employee[:hire_date] = nil
+      plsql.test_employees.insert employee
+      plsql.test_employees.first(:hire_date => :is_null).should == employee
+    end
+
+    it "should select record in table using :column => :is_not_null condition" do
+      employee = @employees.last.dup
+      employee[:employee_id] = employee[:employee_id] + 1
+      employee[:hire_date] = nil
+      plsql.test_employees.insert employee
+      plsql.test_employees.all(:hire_date => :is_not_null, :order_by => :employee_id).should == @employees
+    end
+
     it "should count records in table" do
       plsql.test_employees.select(:count).should == @employees.size
       plsql.test_employees.count.should == @employees.size

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plsql
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +02:00
+date: 2010-03-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord-oracle_enhanced-adapter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
         version: 1.2.4
-    version: 
+  type: :development
+  version_requirements: *id003
 description: |
   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
@@ -105,18 +122,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby API for calling Oracle PL/SQL procedures.