rsim-activerecord-oracle_enhanced-adapter 1.1.9.92 → 1.1.9.93

data/Manifest.txt

@@ -5,6 +5,7 @@ lib/active_record/connection_adapters/emulation/oracle_adapter.rb
 lib/active_record/connection_adapters/oracle_enhanced.rake
 lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 lib/active_record/connection_adapters/oracle_enhanced_connection.rb
+lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb
 lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
 lib/active_record/connection_adapters/oracle_enhanced_dirty.rb
 lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb
@@ -15,6 +16,7 @@ lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 lib/active_record/connection_adapters/oracle_enhanced_version.rb
 spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
 spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -980,3 +980,7 @@ end if defined?(RAILS_ROOT)
 
 # handles quoting of oracle reserved words
 require 'active_record/connection_adapters/oracle_enhanced_reserved_words'
+
+# add BigDecimal#to_d, Fixnum#to_d and Bignum#to_d methods if not already present
+require 'active_record/connection_adapters/oracle_enhanced_core_ext'
+

data/lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb

@@ -0,0 +1,64 @@
+require "bigdecimal"
+unless BigDecimal.instance_methods.include?("to_d")
+  BigDecimal.class_eval do
+    def to_d
+      self
+    end
+  end
+end
+
+unless Bignum.instance_methods.include?("to_d")
+  Bignum.class_eval do
+    def to_d
+      BigDecimal.new(self.to_s)
+    end
+  end
+end
+
+unless Fixnum.instance_methods.include?("to_d")
+  Fixnum.class_eval do
+    def to_d
+      BigDecimal.new(self.to_s)
+    end
+  end
+end
+
+# Add Unicode aware String#upcase and String#downcase methods when mb_chars method is called
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '1.9'
+  begin
+    gem "unicode_utils", ">=1.0.0"
+    require "unicode_utils/upcase"
+    require "unicode_utils/downcase"
+
+    module ActiveRecord
+      module ConnectionAdapters
+        module OracleEnhancedUnicodeString
+          def upcase
+            UnicodeUtils.upcase(self)
+          end
+
+          def downcase
+            UnicodeUtils.downcase(self)
+          end
+        end
+      end
+    end
+
+    class String
+      def mb_chars
+        self.extend(ActiveRecord::ConnectionAdapters::OracleEnhancedUnicodeString)
+        self
+      end
+    end
+
+  rescue LoadError
+    warning_message = "WARNING: Please install unicode_utils gem to support Unicode aware upcase and downcase for String#mb_chars"
+    if defined?(RAILS_DEFAULT_LOGGER)
+      RAILS_DEFAULT_LOGGER.warn warning_message
+    else
+      STDERR.puts warning_message
+    end
+  end
+
+  
+end

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -350,29 +350,3 @@ module ActiveRecord
     
   end
 end
-
-# add BigDecimal#to_d, Fixnum#to_d and Bignum#to_d methods if not already present
-require "bigdecimal"
-unless BigDecimal.instance_methods.include?("to_d")
-  BigDecimal.class_eval do
-    def to_d
-      self
-    end
-  end
-end
-
-unless Bignum.instance_methods.include?("to_d")
-  Bignum.class_eval do
-    def to_d
-      BigDecimal.new(self.to_s)
-    end
-  end
-end
-
-unless Fixnum.instance_methods.include?("to_d")
-  Fixnum.class_eval do
-    def to_d
-      BigDecimal.new(self.to_s)
-    end
-  end
-end

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -94,7 +94,15 @@ module ActiveRecord
             hash[col] =
               case row[i]
               when OCI8::LOB
-                name == 'Writable Large Object' ? row[i]: row[i].read
+                if name == 'Writable Large Object'
+                  row[i]
+                else
+                  data =  row[i].read
+                  # In Ruby 1.9.1 always change encoding to ASCII-8BIT for binaries
+                  data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding) && row[i].is_a?(OCI8::BLOB)
+                  data
+                end
+              # ruby-oci8 1.0 returns OraDate
               when OraDate
                 d = row[i]
                 # RSI: added emulate_dates_by_column_name functionality
@@ -112,6 +120,20 @@ module ActiveRecord
                     ::DateTime.civil(d.year, d.month, d.day, d.hour, d.minute, d.second, offset)
                   end
                 end
+              # ruby-oci8 2.0 returns Time or DateTime
+              when Time, DateTime
+                d = row[i]
+                if OracleEnhancedAdapter.emulate_dates && (d.hour == 0 && d.min == 0 && d.sec == 0)
+                  d.to_date
+                else
+                  # recreate Time or DateTime using Base.default_timezone
+                  begin
+                    Time.send(Base.default_timezone, d.year, d.month, d.day, d.hour, d.min, d.sec)
+                  rescue
+                    offset = Base.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
+                    ::DateTime.civil(d.year, d.month, d.day, d.hour, d.min, d.sec, offset)
+                  end
+                end
               # RSI: added emulate_integers_by_column_name functionality
               when Float
                 n = row[i]
@@ -120,6 +142,10 @@ module ActiveRecord
                 else
                   n
                 end
+              # ruby-oci8 2.0 returns OraNumber - convert it to Integer or BigDecimal
+              when OraNumber
+                n = row[i]
+                n == (n_to_i = n.to_i) ? n_to_i : BigDecimal.new(n.to_s)
               else row[i]
               end unless col == 'raw_rnum_'
           end

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -40,7 +40,8 @@ module ActiveRecord #:nodoc:
           base.instance_eval do
             alias_method_chain :create, :custom_method
             # insert after dirty checking in Rails 2.1
-            if private_instance_methods.include?('update_without_dirty')
+            # in Ruby 1.9 methods names are returned as symbols
+            if private_instance_methods.include?('update_without_dirty') || private_instance_methods.include?(:update_without_dirty)
               alias_method :update_without_custom_method, :update_without_dirty
               alias_method :update_without_dirty, :update_with_custom_method
             else

data/oracle-enhanced.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.1.9.92"
+  s.version = "1.1.9.93"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
     "lib/active_record/connection_adapters/oracle_enhanced.rake",
     "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_cpk.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb",
@@ -26,6 +27,7 @@ Gem::Specification.new do |s|
     "oracle-enhanced.gemspec",
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -128,9 +128,9 @@ describe "OracleEnhancedAdapter database session store" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
     if ENV['RAILS_GEM_VERSION'] >= '2.3'
-      SESSION_CLASS = ActiveRecord::SessionStore::Session
+      @session_class = ActiveRecord::SessionStore::Session
     else
-      SESSION_CLASS = CGI::Session::ActiveRecordStore::Session
+      @session_class = CGI::Session::ActiveRecordStore::Session
     end
   end
 
@@ -144,29 +144,29 @@ describe "OracleEnhancedAdapter database session store" do
   end
 
   it "should save session data" do
-    @session = SESSION_CLASS.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
+    @session = @session_class.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
     @session.save!
-    @session = SESSION_CLASS.find_by_session_id("111111")
+    @session = @session_class.find_by_session_id("111111")
     @session.data.should == "something"
   end
 
   it "should change session data when partial updates enabled" do
-    return pending("Not in this ActiveRecord version") unless SESSION_CLASS.respond_to?(:partial_updates=)
-    SESSION_CLASS.partial_updates = true
-    @session = SESSION_CLASS.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
+    return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:partial_updates=)
+    @session_class.partial_updates = true
+    @session = @session_class.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
     @session.save!
-    @session = SESSION_CLASS.find_by_session_id("222222")
+    @session = @session_class.find_by_session_id("222222")
     @session.data = "other thing"
     @session.save!
     # second save should call again blob writing callback
     @session.save!
-    @session = SESSION_CLASS.find_by_session_id("222222")
+    @session = @session_class.find_by_session_id("222222")
     @session.data.should == "other thing"
   end
 
   it "should have one enhanced_write_lobs callback" do
-    return pending("Not in this ActiveRecord version") unless SESSION_CLASS.respond_to?(:after_save_callback_chain)
-    SESSION_CLASS.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
+    return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:after_save_callback_chain)
+    @session_class.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
   end
 
   it "should not set sessions table session_id column type as integer if emulate_integers_by_column_name is true" do
@@ -214,14 +214,14 @@ describe "OracleEnhancedAdapter ignore specified table columns" do
   end
 
   it "should ignore specified table columns" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number, :hire_date
     end
     TestEmployee.connection.columns('test_employees').select{|c| ['phone_number','hire_date'].include?(c.name) }.should be_empty
   end
 
   it "should ignore specified table columns specified in several lines" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number
       ignore_table_columns  :hire_date
     end
@@ -229,7 +229,7 @@ describe "OracleEnhancedAdapter ignore specified table columns" do
   end
 
   it "should not ignore unspecified table columns" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number, :hire_date
     end
     TestEmployee.connection.columns('test_employees').select{|c| c.name == 'email' }.should_not be_empty
@@ -253,10 +253,10 @@ describe "OracleEnhancedAdapter table and sequence creation with non-default pri
         end
       end
     end
-    class Keyboard < ActiveRecord::Base
+    class ::Keyboard < ActiveRecord::Base
       set_primary_key :key_number
     end
-    class IdKeyboard < ActiveRecord::Base
+    class ::IdKeyboard < ActiveRecord::Base
     end
   end
 
@@ -285,7 +285,7 @@ describe "OracleEnhancedAdapter without composite_primary_keys" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
-    class Employee < ActiveRecord::Base
+    class ::Employee < ActiveRecord::Base
       set_primary_key :employee_id
     end
   end
@@ -342,7 +342,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_sequence_start_value.should == 10000
 
     create_test_employees_table
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 10000
@@ -352,7 +352,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_sequence_start_value = 1
 
     create_test_employees_table
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 1
@@ -360,7 +360,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
 
   it "should use sequence start value from table definition" do
     create_test_employees_table(10)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 10
@@ -368,7 +368,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
 
   it "should use sequence start value and other options from table definition" do
     create_test_employees_table("100 NOCACHE INCREMENT BY 10")
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 100
@@ -409,7 +409,7 @@ describe "OracleEnhancedAdapter table and column comments" do
   it "should create table with table comment" do
     table_comment = "Test Employees"
     create_test_employees_table(table_comment)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     @conn.table_comment("test_employees").should == table_comment
     TestEmployee.table_comment.should == table_comment
@@ -418,7 +418,7 @@ describe "OracleEnhancedAdapter table and column comments" do
   it "should create table with columns comment" do
     column_comments = {:first_name => "Given Name", :last_name => "Surname"}
     create_test_employees_table(nil, column_comments)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     [:first_name, :last_name].each do |attr|
       @conn.column_comment("test_employees", attr.to_s).should == column_comments[attr]
@@ -433,7 +433,7 @@ describe "OracleEnhancedAdapter table and column comments" do
     table_comment = "Test Employees"
     column_comments = {:first_name => "Given Name", :last_name => "Surname"}
     create_test_employees_table(table_comment, column_comments)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     @conn.table_comment(TestEmployee.table_name).should == table_comment
     TestEmployee.table_comment.should == table_comment
@@ -477,7 +477,7 @@ describe "OracleEnhancedAdapter column quoting" do
 
   it "should allow creation of a table with oracle reserved words as column names" do
     create_test_reserved_words_table
-    class TestReservedWord < ActiveRecord::Base; end
+    class ::TestReservedWord < ActiveRecord::Base; end
 
     [:varchar2, :integer].each do |attr|
       TestReservedWord.columns_hash[attr.to_s].name.should == attr.to_s
@@ -542,7 +542,7 @@ describe "OracleEnhancedAdapter table quoting" do
 
   it "should allow creation of a table with non alphanumeric characters" do
     create_warehouse_things_table
-    class WarehouseThing < ActiveRecord::Base
+    class ::WarehouseThing < ActiveRecord::Base
       set_table_name "warehouse-things"
     end
 

data/spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "OracleEnhancedAdapter to_d method" do
+  it "BigDecimal#to_d returns the same decimal number" do
+    d = BigDecimal.new("12345678901234567890.0123456789")
+    d.to_d.should == d
+  end
+  
+  it "Bignum#to_d translates large integer to decimal" do
+    n = 12345678901234567890
+    n.to_d.should == BigDecimal.new(n.to_s)
+  end
+
+  it "Fixnum#to_d translates small integer to decimal" do
+    n = 123456
+    n.to_d.should == BigDecimal.new(n.to_s)
+  end
+end
+
+if ENV['RAILS_GEM_VERSION'] >= '2.3'
+
+  describe "OracleEnhancedAdapter Unicode aware upcase and downcase" do
+    before(:all) do
+      @down = "āčēģīķļņšūž"
+      @up = "ĀČĒĢĪĶĻŅŠŪŽ"
+    end
+
+    it "should translate Unicode string to upcase" do
+      @down.mb_chars.upcase.to_s.should == @up
+    end
+
+    it "should translate Unicode string to downcase" do
+      @up.mb_chars.downcase.to_s.should == @down
+    end
+  
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -3,9 +3,13 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 describe "OracleEnhancedAdapter composite_primary_keys support" do
 
   before(:all) do
-    require "composite_primary_keys"
+    if defined?(ActiveRecord::ConnectionAdapters::OracleAdapter)
+      @old_oracle_adapter = ActiveRecord::ConnectionAdapters::OracleAdapter
+      ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
+    end
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    class JobHistory < ActiveRecord::Base
+    require 'composite_primary_keys'
+    class ::JobHistory < ActiveRecord::Base
       set_table_name "job_history"
       set_primary_keys :employee_id, :start_date
     end
@@ -14,6 +18,10 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
   after(:all) do
     Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
     Object.send(:remove_const, 'JobHistory') if defined?(JobHistory)
+    if @old_oracle_adapter
+      ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
+      ActiveRecord::ConnectionAdapters::OracleAdapter = @old_oracle_adapter
+    end
   end
 
   it "should tell ActiveRecord that count distinct is not supported" do

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -79,7 +79,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
       ActiveRecord::Base.connection.clear_types_for_columns
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
-      class TestEmployee < ActiveRecord::Base
+      class ::TestEmployee < ActiveRecord::Base
         set_table_name "hr.test_employees"
         set_primary_key :employee_id
       end
@@ -121,7 +121,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     end
 
     it "should return Date value from DATE column if emulate_dates_by_column_name is false but column is defined as date" do
-      class TestEmployee < ActiveRecord::Base
+      class ::TestEmployee < ActiveRecord::Base
         set_date_columns :hire_date
       end
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
@@ -130,7 +130,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     end
 
     it "should return Time value from DATE column if emulate_dates_by_column_name is true but column is defined as datetime" do
-      class TestEmployee < ActiveRecord::Base
+      class ::TestEmployee < ActiveRecord::Base
         set_datetime_columns :hire_date
       end
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
@@ -225,7 +225,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
 
   describe "/ NUMBER values from ActiveRecord model" do
     before(:each) do
-      class Test2Employee < ActiveRecord::Base
+      class ::Test2Employee < ActiveRecord::Base
       end
     end
     
@@ -369,7 +369,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
   describe "/ VARCHAR2 boolean values from ActiveRecord model" do
     before(:each) do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
-      class Test3Employee < ActiveRecord::Base
+      class ::Test3Employee < ActiveRecord::Base
       end
     end
     
@@ -420,7 +420,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
 
     it "should return boolean value from VARCHAR2 boolean column if column specified in set_boolean_columns" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-      class Test3Employee < ActiveRecord::Base
+      class ::Test3Employee < ActiveRecord::Base
         set_boolean_columns :test_boolean
       end
       create_employee3(:test_boolean => true)
@@ -482,7 +482,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
   describe "/ TIMESTAMP WITH TIME ZONE values from ActiveRecord model" do
     before(:all) do
-      class TestEmployee < ActiveRecord::Base
+      class ::TestEmployee < ActiveRecord::Base
         set_primary_key :employee_id
       end
     end
@@ -582,7 +582,7 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
   before(:each) do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
     end
     @today = Date.new(2008,6,28)
@@ -666,7 +666,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       CREATE SEQUENCE test_employees_seq  MINVALUE 1
         INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
     SQL
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
     end
   end
@@ -794,7 +794,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       CREATE SEQUENCE test_employees_seq  MINVALUE 1
         INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
     SQL
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
     end
   end
@@ -859,7 +859,7 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
   end
 
   before(:each) do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
     end
   end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -92,7 +92,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
 
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
       
       validates_presence_of :first_name, :last_name, :hire_date

data/spec/spec_helper.rb

@@ -82,3 +82,6 @@ SYS_CONNECTION_PARAMS = {
   :password => "manager",
   :privilege => "SYSDBA"
 }
+
+# For JRuby Set default $KCODE to UTF8
+$KCODE = "UTF8" if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsim-activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.9.92
+  version: 1.1.9.93
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -43,6 +43,7 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced.rake
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 - lib/active_record/connection_adapters/oracle_enhanced_connection.rb
+- lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
 - lib/active_record/connection_adapters/oracle_enhanced_dirty.rb
 - lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb
@@ -54,6 +55,7 @@ files:
 - oracle-enhanced.gemspec
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb