ruby-plsql 0.5.3 → 0.6.0

data/spec/plsql/schema_spec.rb

@@ -37,6 +37,13 @@ describe "Schema connection" do
     expect(plsql.schema_name).to eq(DATABASE_USERS_AND_PASSWORDS[0][0].upcase)
   end
 
+  it 'should match altered current_schema in database session' do
+    plsql.connection = @conn
+    expected_current_schema = DATABASE_USERS_AND_PASSWORDS[1][0]
+    plsql.execute "ALTER SESSION set current_schema=#{expected_current_schema}"
+    expect(plsql.schema_name).to eq(expected_current_schema.upcase)
+  end
+
   it "should return new schema name after reconnection" do
     plsql.connection = @conn
     expect(plsql.schema_name).to eq(DATABASE_USERS_AND_PASSWORDS[0][0].upcase)
@@ -86,7 +93,7 @@ describe "Connection with connect!" do
   it "should not connect with wrong port number" do
     expect {
       plsql.connect! @username, @password, :host => @host, :port => 9999, :database => @database
-    }.to raise_error(/no listener|could not establish the connection/)
+    }.to raise_error(/ORA-12541|could not establish the connection/)
   end
 
   it "should connect with one Hash parameter" do
@@ -95,10 +102,11 @@ describe "Connection with connect!" do
     expect(plsql.schema_name).to eq(@username.upcase)
   end
 
-  it "should set session time zone from TZ environment variable" do
+  it "should set session time zone from ORA_SDTZ environment variable" do
     plsql.connect! @username, @password, @database
-    expect(plsql.connection.time_zone).to eq(ENV['TZ'])
-  end
+    expect(plsql.connection.time_zone).to eq(ENV['ORA_SDTZ'])
+  end if ENV['ORA_SDTZ']
+
 
   it "should set session time zone from :time_zone parameter" do
     plsql.connect! :username => @username, :password => @password, :database => @database, :time_zone => 'EET'
@@ -220,6 +228,15 @@ describe "ActiveRecord connection" do
     plsql.activerecord_class = TestModel
     expect(plsql.schema_name).to eq('HR')
   end
+
+  it "should safely close cursors in threaded environment" do
+    expect {
+      t1 = Thread.new { plsql.dbms_lock.sleep(1) }.tap { |t| t.abort_on_exception = true }
+      t2 = Thread.new { plsql.dbms_lock.sleep(2) }.tap { |t| t.abort_on_exception = true }
+      [t2, t1].each { |t| t.join }
+    }.not_to raise_error
+  end
+
 end if defined?(ActiveRecord)
 
 describe "DBMS_OUTPUT logging" do

data/spec/plsql/sql_statements_spec.rb

@@ -21,7 +21,7 @@ describe "SQL statements /" do
         CREATE TABLE test_employees (
           employee_id   NUMBER(15),
           first_name    VARCHAR2(50),
-          last_name     VARCHAR2(50),
+          last_name     VARCHAR(50),
           hire_date     DATE
         )
       SQL

data/spec/plsql/table_spec.rb

@@ -8,7 +8,7 @@ describe "Table" do
       CREATE TABLE test_employees (
         employee_id   NUMBER(15) NOT NULL,
         first_name    VARCHAR2(50),
-        last_name     VARCHAR2(50),
+        last_name     VARCHAR(50),
         hire_date     DATE,
         created_at    TIMESTAMP,
         status        VARCHAR2(1) DEFAULT 'N'
@@ -35,7 +35,7 @@ describe "Table" do
       CREATE TABLE test_employees2 (
         employee_id   NUMBER(15) NOT NULL,
         first_name    VARCHAR2(50),
-        last_name     VARCHAR2(50),
+        last_name     VARCHAR(50),
         hire_date     DATE DEFAULT SYSDATE,
         address       t_address,
         phones        t_phones

data/spec/plsql/type_spec.rb

@@ -80,7 +80,7 @@ describe "Type" do
       CREATE OR REPLACE TYPE t_employee AS OBJECT (
         employee_id   NUMBER(15),
         first_name    VARCHAR2(50),
-        last_name     VARCHAR2(50),
+        last_name     VARCHAR(50),
         hire_date     DATE,
         address       t_address,
         phones        t_phones

data/spec/plsql/variable_spec.rb

@@ -16,6 +16,7 @@ describe "Package variables /" do
           varchar2_default3 varchar2(50) NOT NULL := 'default';
           varchar2_3_char VARCHAR2(3 CHAR);
           varchar2_3_byte VARCHAR2(3 BYTE);
+          varchar_variable VARCHAR(50);
           char_variable char(10) ;
           nvarchar2_variable NVARCHAR2(50);
           nchar_variable NCHAR(10);
@@ -33,6 +34,11 @@ describe "Package variables /" do
       plsql.logoff
     end
 
+    it "should set and get VARCHAR variable" do
+      plsql.test_package.varchar_variable = 'abc'
+      expect(plsql.test_package.varchar_variable).to eq('abc')
+    end
+
     it "should set and get VARCHAR2 variable" do
       plsql.test_package.varchar2_variable = 'abc'
       expect(plsql.test_package.varchar2_variable).to eq('abc')
@@ -95,25 +101,15 @@ describe "Package variables /" do
 
   end
 
-  describe "Numeric" do
+  shared_examples "Numeric" do |ora_data_type, default, class_, given, expected|
+
     before(:all) do
       plsql.connect! CONNECTION_PARAMS
       plsql.execute <<-SQL
         CREATE OR REPLACE PACKAGE test_package IS
-          integer_variable INTEGER;
-          integer10_variable NUMBER(10);
-          integer10_default NUMBER(10) := 1;
-          number_variable NUMBER;
-          number_with_scale NUMBER(15,2);
-          pls_int_variable PLS_INTEGER;
-          bin_int_variable BINARY_INTEGER;
+          numeric_var #{ora_data_type}#{default ? ':= ' + default.to_s : nil};
         END;
       SQL
-      plsql.execute <<-SQL
-        CREATE OR REPLACE PACKAGE BODY test_package IS
-        END;
-      SQL
-
     end
 
     after(:all) do
@@ -121,45 +117,41 @@ describe "Package variables /" do
       plsql.logoff
     end
 
-    it "should set and get INTEGER variable" do
-      plsql.test_package.integer_variable = 1
-      expect(plsql.test_package.integer_variable).to be_a Fixnum
-      expect(plsql.test_package.integer_variable).to eq(1)
-    end
+    it "should get #{ora_data_type} variable default value" do
+      expect(plsql.test_package.numeric_var).to eq(default)
+    end if default
 
-    it "should set and get integer variable with precision" do
-      plsql.test_package.integer10_variable = 1
-      expect(plsql.test_package.integer10_variable).to be_a Fixnum
-      expect(plsql.test_package.integer10_variable).to eq(1)
+    it "should get #{ora_data_type} variable type mapped to #{class_.to_s}" do
+      plsql.test_package.numeric_var = given
+      expect(plsql.test_package.numeric_var).to be_a class_
     end
 
-    it "should get integer variable default value" do
-      expect(plsql.test_package.integer10_default).to eq(1)
+    it "should set and get #{ora_data_type} variable" do
+      plsql.test_package.numeric_var = given
+      expect(plsql.test_package.numeric_var).to eq(expected)
     end
 
-    it "should set and get PLS_INTEGER variable" do
-      plsql.test_package.pls_int_variable = 1
-      expect(plsql.test_package.pls_int_variable).to be_a Fixnum
-      expect(plsql.test_package.pls_int_variable).to eq(1)
-    end
-
-    it "should set and get BINARY_INTEGER variable" do
-      plsql.test_package.bin_int_variable = 1
-      expect(plsql.test_package.bin_int_variable).to be_a Fixnum
-      expect(plsql.test_package.bin_int_variable).to eq(1)
-    end
-
-    it "should set and get NUMBER variable" do
-      plsql.test_package.number_variable = 123.456
-      expect(plsql.test_package.number_variable).to be_a BigDecimal
-      expect(plsql.test_package.number_variable).to eq(123.456)
-    end
+  end
 
-    it "should set and get NUMBER variable with scale" do
-      plsql.test_package.number_with_scale = 123.456
-      expect(plsql.test_package.number_with_scale).to eq(123.46) # rounding to two decimal digits
+  [
+      {:ora_data_type => 'INTEGER',        :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'NUMBER(10)',     :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'NUMBER(10)',     :default => 5,   :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'NUMBER',         :default => nil, :class => BigDecimal, :given => 123.456, :expected => 123.456},
+      {:ora_data_type => 'NUMBER(15,2)',   :default => nil, :class => BigDecimal, :given => 123.456, :expected => 123.46},
+      {:ora_data_type => 'PLS_INTEGER',    :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'BINARY_INTEGER', :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'SIMPLE_INTEGER', :default => 10,  :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'NATURAL',        :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'NATURALN',       :default => 0,   :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'POSITIVE',       :default => nil, :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'POSITIVEN',      :default => 5,   :class => Fixnum, :given => 1, :expected => 1},
+      {:ora_data_type => 'SIGNTYPE',       :default => -1,  :class => Fixnum, :given => 1, :expected => 1},
+  ].each do |row|
+    ora_data_type, default, class_, given, expected = row.values
+    describe ora_data_type+(default ? ' with default' : '') do
+      include_examples "Numeric", ora_data_type, default, class_, given, expected
     end
-
   end
 
   describe "Date and Time" do

data/spec/spec_helper.rb

@@ -111,8 +111,3 @@ 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'

data/spec/support/create_arunit_user.sql

@@ -0,0 +1,2 @@
+create user arunit identified by arunit;
+grant create session to arunit;

data/spec/support/custom_config.rb.sample

@@ -0,0 +1,14 @@
+# Template file should be copied to locale_support.rb to be automatically included by code
+#
+
+# Set Oracle Database session timezone, if not already set in env variable
+#   This setting needs to be in place to make sure that Oracle properly represents the timestamp format on your local machine.
+#   Do not use 'OS_TZ' value or fixed offset values like '05:00', for daylight saving-enabled timezones.
+#   See: http://docs.oracle.com/cd/E18283_01/server.112/e10729/ch4datetime.htm#CBBEEAFB
+#   The setting cannot be derived directly from operating system or ruby, as different timezone names are used.
+ENV['ORA_SDTZ'] ||= 'Europe/Riga'
+#Sets the Ruby timezone to be used, if not already set in env variable
+ENV['TZ'] ||= 'Europe/Riga'
+#Sets the Language, locale and encoding settings to be used by Oracle session, if not already set in env variable
+ENV['NLS_LANG'] ||= 'AMERICAN_AMERICA.AL32UTF8'
+

data/spec/support/unlock_and_setup_hr_user.sql

@@ -0,0 +1,2 @@
+alter user hr identified by hr account unlock;
+grant execute on dbms_lock to hr;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-plsql
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +78,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
@@ -74,7 +88,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
@@ -98,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
 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
@@ -116,6 +130,13 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".travis.yml"
+- ".travis/oracle/LICENSE"
+- ".travis/oracle/README.md"
+- ".travis/oracle/download.js"
+- ".travis/oracle/download.sh"
+- ".travis/oracle/install.sh"
+- ".travis/setup_accounts.sh"
 - Gemfile
 - History.txt
 - License.txt
@@ -155,8 +176,11 @@ files:
 - spec/plsql/view_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/create_arunit_user.sql
+- spec/support/custom_config.rb.sample
 - spec/support/file_check_script.sh
 - spec/support/test_db.rb
+- spec/support/unlock_and_setup_hr_user.sql
 homepage: http://github.com/rsim/ruby-plsql
 licenses: []
 metadata: {}
@@ -176,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby API for calling Oracle PL/SQL procedures.