ruby-plsql 0.4.3 → 0.4.4

data/.gitignore

@@ -1,3 +1,5 @@
+.bundle
+.rvmrc
 .svn
 .DS_Store
 coverage
@@ -6,5 +8,4 @@ pkg
 log
 tmp
 sqlnet.log
-ruby-plsql.gemspec
-
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gem 'jeweler'
+gem 'rspec', "~> 1.3.0"
+
+unless ENV['NO_ACTIVERECORD']
+  # avoid loading activerecord 3.0 beta
+  gem 'activerecord', '=2.3.8'
+  gem 'activerecord-oracle_enhanced-adapter', '=1.3.1'
+end
+
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  gem 'ruby-oci8', '>=2.0.4'
+end

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.4 2010-10-06
+
+* Improvements
+  * When using plsql.connect! then set session time zone from ENV['TZ'] or from :time_zone option
+* Bug fixes
+  * Bugfix for case when object is in invalid state but has no errors
+  * Support ref cursor return value with type defined inside package
+
 == 0.4.3 2010-03-25
 
 * Improvements

data/Rakefile

@@ -14,9 +14,9 @@ EOS
     gem.email = "raimonds.simanovskis@gmail.com"
     gem.homepage = "http://github.com/rsim/ruby-plsql"
     gem.authors = ["Raimonds Simanovskis"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "activerecord", "= 2.3.5"
-    gem.add_development_dependency "activerecord-oracle_enhanced-adapter", ">= 1.2.4"
+    gem.add_development_dependency "rspec", "~> 1.3.0"
+    gem.add_development_dependency "activerecord", "= 2.3.8"
+    gem.add_development_dependency "activerecord-oracle_enhanced-adapter", "~> 1.3.1"
     gem.extra_rdoc_files = ['README.rdoc']
   end
   Jeweler::GemcutterTasks.new
@@ -34,6 +34,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = ['--exclude', '/Library,spec/']
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/plsql/connection.rb

@@ -24,7 +24,7 @@ module PLSQL
     end
 
     def self.create_new(params) #:nodoc:
-      case driver_type
+      conn = case driver_type
       when :oci
         OCIConnection.create_raw(params)
       when :jdbc
@@ -32,6 +32,8 @@ module PLSQL
       else
         raise ArgumentError, "Unknown raw driver"
       end
+      conn.set_time_zone(params[:time_zone])
+      conn
     end
 
     def self.driver_type #:nodoc:
@@ -195,6 +197,17 @@ module PLSQL
       @session_id ||= select_first("SELECT TO_NUMBER(USERENV('SESSIONID')) FROM dual")[0]
     end
 
+    # Set time zone (default taken from TZ environment variable)
+    def set_time_zone(time_zone=nil)
+      time_zone ||= ENV['TZ']
+      exec("alter session set time_zone = '#{time_zone}'") if time_zone
+    end
+
+    # Returns session time zone
+    def time_zone
+      select_first("SELECT SESSIONTIMEZONE FROM dual")[0]
+    end
+
     RUBY_TEMP_TABLE_PREFIX = 'ruby_'
 
     # Drop all ruby temporary tables that are used for calling packages with table parameter types defined in packages

data/lib/plsql/jdbc_connection.rb

@@ -41,6 +41,11 @@ module PLSQL
       new(java.sql.DriverManager.getConnection(url, params[:username], params[:password]))
     end
 
+    def set_time_zone(time_zone=nil)
+      time_zone ||= ENV['TZ']
+      raw_connection.setSessionTimeZone(time_zone)
+    end
+
     def logoff
       super
       raw_connection.close

data/lib/plsql/procedure.rb

@@ -165,7 +165,7 @@ module PLSQL
             case previous_level_argument_metadata[data_level - 1][:data_type]
             when 'PL/SQL RECORD'
               previous_level_argument_metadata[data_level - 1][:fields][argument_name.downcase.to_sym] = argument_metadata
-            when 'PL/SQL TABLE', 'TABLE', 'VARRAY'
+            when 'PL/SQL TABLE', 'TABLE', 'VARRAY', 'REF CURSOR'
               previous_level_argument_metadata[data_level - 1][:element] = argument_metadata
             end
           end
@@ -209,7 +209,7 @@ module PLSQL
       @tmp_tables_created[overload] = true
     end
 
-    PLSQL_COMPOSITE_TYPES = ['PL/SQL RECORD', 'PL/SQL TABLE', 'TABLE', 'VARRAY'].freeze
+    PLSQL_COMPOSITE_TYPES = ['PL/SQL RECORD', 'PL/SQL TABLE', 'TABLE', 'VARRAY', 'REF CURSOR'].freeze
     def composite_type?(data_type) #:nodoc:
       PLSQL_COMPOSITE_TYPES.include? data_type
     end

data/lib/plsql/schema.rb

@@ -204,10 +204,10 @@ module PLSQL
           AND object_type IN ('PROCEDURE','FUNCTION','PACKAGE','TABLE','VIEW','SEQUENCE','TYPE','SYNONYM')",
           object_schema_name, object_name)
         object_type, object_id, status, body_status = row
-        raise ArgumentError, "Database object '#{object_schema_name}.#{object_name}' is not in valid status\n" <<
-          _errors(object_schema_name, object_name, object_type) if status == 'INVALID'
-        raise ArgumentError, "Package '#{object_schema_name}.#{object_name}' body is not in valid status\n" <<
-          _errors(object_schema_name, object_name, 'PACKAGE BODY') if body_status == 'INVALID'
+        raise ArgumentError, "Database object '#{object_schema_name}.#{object_name}' is not in valid status\n#{
+          _errors(object_schema_name, object_name, object_type)}" if status == 'INVALID'
+        raise ArgumentError, "Package '#{object_schema_name}.#{object_name}' body is not in valid status\n#{
+          _errors(object_schema_name, object_name, 'PACKAGE BODY')}" if body_status == 'INVALID'
         case object_type
         when 'PROCEDURE', 'FUNCTION'
           Procedure.new(self, name, nil, override_schema_name, object_id)

data/ruby-plsql.gemspec

@@ -0,0 +1,101 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-plsql}
+  s.version = "0.4.4"
+
+  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.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  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 = [
+    "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"
+  ]
+
+  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"])
+    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"])
+    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"])
+  end
+end
+

data/spec/plsql/connection_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Connection" do
 
@@ -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, 0, 4]
+      @conn.database_version.should == DATABASE_VERSION.split('.').map{|n| n.to_i}
     end
 
     it "should get session ID" do

data/spec/plsql/package_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Package" do
   before(:all) do

data/spec/plsql/procedure_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Parameter type mapping /" do
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
   end
 
   after(:all) do
@@ -1503,12 +1503,75 @@ describe "Parameter type mapping /" do
     end
 
   end
+
+  describe "Function with typed ref cursor return value" do
+
+    before(:all) do
+      plsql.execute "DROP TABLE typed_ref_cursor_table" rescue nil
+
+      plsql.execute <<-SQL
+        CREATE TABLE typed_ref_cursor_table
+        ( col1 VARCHAR2(10), col2 NUMBER )
+      SQL
+
+      plsql.execute <<-SQL
+        CREATE OR REPLACE PACKAGE typed_ref_cursor_test IS
+          TYPE test_rec IS RECORD ( col1 VARCHAR2(10), col2 NUMBER ) ;
+          TYPE test_rec_ref IS REF CURSOR RETURN test_rec ;
+
+          function get_all RETURN test_rec_ref ;
+        END typed_ref_cursor_test ;
+      SQL
+
+      plsql.execute <<-SQL
+        CREATE OR REPLACE PACKAGE BODY typed_ref_cursor_test IS
+          FUNCTION get_all RETURN test_rec_ref IS
+            rc test_rec_ref ;
+          BEGIN
+            OPEN rc FOR SELECT * FROM typed_ref_cursor_table ;
+            RETURN rc ;
+          END get_all ;
+        END typed_ref_cursor_test ;
+      SQL
+
+      @fields = [:col1, :col2 ]
+      @rows = (1..3).map{|i| ["row #{i}", i]}
+      plsql.typed_ref_cursor_table.insert_values *@rows
+      plsql.commit
+
+    end
+
+    after(:all) do
+      plsql.execute "DROP PACKAGE typed_ref_cursor_test"
+      plsql.execute "DROP TABLE typed_ref_cursor_table"
+    end
+
+    it "should return cursor and fetch first row" do
+      plsql.typed_ref_cursor_test.get_all do |cursor|
+        cursor.fetch.should == @rows[0]
+      end.should be_nil
+    end
+
+    it "should fetch hash from returned cursor" do
+      plsql.typed_ref_cursor_test.get_all do |cursor|
+        cursor.fetch_hash.should == Hash[*@fields.zip(@rows[0]).flatten]
+      end
+    end
+
+    it "should fetch all rows from returned cursor" do
+      plsql.typed_ref_cursor_test.get_all do |cursor|
+        cursor.fetch_all.should == @rows
+      end
+    end
+
+  end
+
 end
 
 describe "Synonyms /" do
 
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
   end
 
   after(:all) do
@@ -1636,7 +1699,7 @@ end
 describe "SYS.STANDARD procedures /" do
 
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
   end
 
   after(:all) do

data/spec/plsql/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Schema" do
   
@@ -94,6 +94,16 @@ describe "Connection with connect!" do
     plsql.schema_name.should == @username.upcase
   end
 
+  it "should set session time zone from TZ environment variable" do
+    plsql.connect! @username, @password, @database
+    plsql.connection.time_zone.should == ENV['TZ']
+  end
+
+  it "should set session time zone from :time_zone parameter" do
+    plsql.connect! :username => @username, :password => @password, :database => @database, :time_zone => 'EET'
+    plsql.connection.time_zone.should == 'EET'
+  end
+
 end
 
 describe "Named Schema" do

data/spec/plsql/sequence_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Table" do
   before(:all) do

data/spec/plsql/sql_statements_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "SQL statements /" do
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
     plsql.connection.autocommit = false
   end
 

data/spec/plsql/table_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Table" do
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
     plsql.connection.autocommit = false
     plsql.execute <<-SQL
       CREATE TABLE test_employees (

data/spec/plsql/type_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Type" do
   before(:all) do

data/spec/plsql/variable_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Package variables /" do
 
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
   end
 
   after(:all) do

data/spec/plsql/version_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Version" do
   it "should return ruby-plsql version" do

data/spec/plsql/view_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "View" do
   before(:all) do
-    plsql.connection = get_connection
+    plsql.connect! CONNECTION_PARAMS
     plsql.connection.autocommit = false
     plsql.execute <<-SQL
       CREATE TABLE test_employees (

data/spec/spec_helper.rb

@@ -1,23 +1,28 @@
 require "rubygems"
-gem "rspec"
-require "spec"
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'spec'
 
 unless ENV['NO_ACTIVERECORD']
-  # avoid loading activerecord 3.0 beta
-  gem "activerecord", "= 2.3.5"
-  require "active_record"
-  gem "activerecord-oracle_enhanced-adapter", "= 1.2.4"
+  require 'active_record'
 else
-  puts "Without ActiveRecord"
+  puts 'Without ActiveRecord'
 end
 
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
-  gem "ruby-oci8", ">=2.0.3"
-end
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require "ruby-plsql"
+require 'ruby-plsql'
 
 DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
 DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
@@ -26,6 +31,8 @@ DATABASE_USERS_AND_PASSWORDS = [
   [ENV['DATABASE_USER'] || 'hr', ENV['DATABASE_PASSWORD'] || 'hr'],
   [ENV['DATABASE_USER2'] || 'arunit', ENV['DATABASE_PASSWORD2'] || 'arunit']
 ]
+# specify which database version is used (will be verified in one test)
+DATABASE_VERSION = ENV['DATABASE_VERSION'] || '10.2.0.4'
 
 def get_connection(user_number = 0)
   database_user, database_password = DATABASE_USERS_AND_PASSWORDS[user_number]
@@ -68,3 +75,8 @@ class Hash
     self.reject {|key, value| !whitelist.include?(key) }
   end unless method_defined?(:only)
 end
+
+# set default time zone in TZ environment variable
+# which will be used to set session time zone
+ENV['TZ'] ||= 'Europe/Riga'
+# ENV['TZ'] ||= 'UTC'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plsql
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -14,49 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +02:00
+date: 2010-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 8
+        version: 2.3.8
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord-oracle_enhanced-adapter
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
-        - 2
-        - 4
-        version: 1.2.4
+        - 3
+        - 1
+        version: 1.3.1
   type: :development
   version_requirements: *id003
 description: |
@@ -73,6 +80,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - History.txt
 - License.txt
 - README.rdoc
@@ -96,6 +104,7 @@ files:
 - 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
@@ -119,23 +128,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby API for calling Oracle PL/SQL procedures.