activerecord-oracle_enhanced-adapter 1.1.9 → 1.2.0

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -5,17 +5,14 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
   describe "OracleEnhancedAdapter dirty object tracking" do
 
     before(:all) do
-      ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                              :database => "xe",
-                                              :username => "hr",
-                                              :password => "hr")
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       @conn = ActiveRecord::Base.connection
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
           id            NUMBER,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
-          job_id        NUMBER(6,0),
+          job_id        NUMBER(6,0) NULL,
           salary        NUMBER(8,2),
           comments      CLOB,
           hire_date     DATE
@@ -80,6 +77,17 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
       @employee.should_not be_changed
     end
 
+    it "should not mark integer as changed when reassigning it" do
+      @employee = TestEmployee.new
+      @employee.job_id = 0
+      @employee.save!.should be_true
+      
+      @employee.should_not be_changed
+
+      @employee.job_id = '0'
+      @employee.should_not be_changed
+    end
+
   end
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+
+
+describe "OracleEnhancedAdapter emulate OracleAdapter" do
+
+  before(:all) do
+    if defined?(ActiveRecord::ConnectionAdapters::OracleAdapter)
+      @old_oracle_adapter = ActiveRecord::ConnectionAdapters::OracleAdapter
+      ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
+    end
+  end
+
+  it "should be an OracleAdapter" do
+    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(:emulate_oracle_adapter => true))
+    ActiveRecord::Base.connection.should_not be_nil
+    ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::OracleAdapter).should be_true
+  end
+
+  after(:all) do
+    if @old_oracle_adapter
+      ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
+      ActiveRecord::ConnectionAdapters::OracleAdapter = @old_oracle_adapter
+    end
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -4,12 +4,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   include LoggerSpecHelper
   
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    plsql.connection = @conn.raw_connection
+    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @conn.execute("DROP TABLE test_employees") rescue nil
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
@@ -95,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
@@ -136,6 +133,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   
   after(:all) do
     Object.send(:remove_const, "TestEmployee")
+    @conn = ActiveRecord::Base.connection    
     @conn.execute "DROP TABLE test_employees"
     @conn.execute "DROP SEQUENCE test_employees_s"
     @conn.execute "DROP PACKAGE test_employees_pkg"
@@ -218,6 +216,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should log create record" do
     log_to @buffer
+    # reestablish plsql.connection as log_to might reset existing connection
+    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -234,6 +234,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     log_to @buffer
+    # reestablish plsql.connection as log_to might reset existing connection
+    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee.save!
     @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
   end
@@ -245,6 +247,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     log_to @buffer
+    # reestablish plsql.connection as log_to might reset existing connection
+    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee.destroy
     @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
   end

data/spec/spec_helper.rb

@@ -14,19 +14,36 @@ elsif ENV['RAILS_GEM_VERSION'] =~ /^2.1/
   gem 'actionpack', '=2.1.2'
   gem 'activesupport', '=2.1.2'
   gem 'composite_primary_keys', '=1.0.8'
-else
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.2/
   gem 'activerecord', '=2.2.2'
   gem 'actionpack', '=2.2.2'
   gem 'activesupport', '=2.2.2'
-  gem 'composite_primary_keys', '=2.2.0'
+  gem 'composite_primary_keys', '=2.2.2'
+else
+  ENV['RAILS_GEM_VERSION'] ||= '2.3.2'
+  gem 'activerecord', '=2.3.2'
+  gem 'actionpack', '=2.3.2'
+  gem 'activesupport', '=2.3.2'
+  gem 'composite_primary_keys', '=2.2.2'
 end
 
 require 'activerecord'
 require 'actionpack'
-require 'action_controller/session/active_record_store'
+if ENV['RAILS_GEM_VERSION'] >= '2.3'
+  require 'action_controller/session/abstract_store'
+  require 'active_record/session_store'
+else
+  require 'action_controller/session/active_record_store'
+end
+if !defined?(RUBY_ENGINE)
+  gem "activerecord-oracle-adapter"
+  require 'active_record/connection_adapters/oracle_adapter'
+elsif RUBY_ENGINE == 'jruby'
+  gem "activerecord-jdbc-adapter"
+  require 'active_record/connection_adapters/jdbc_adapter'
+end
+
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
-gem "activerecord-oracle-adapter"
-require 'active_record/connection_adapters/oracle_adapter'
 
 module LoggerSpecHelper
   def log_to(stream)
@@ -39,4 +56,32 @@ module LoggerSpecHelper
     ActiveRecord::Base.colorize_logging = false
     ActiveRecord::Base.logger.level = Logger::DEBUG
   end
-end
+end
+
+CONNECTION_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => "xe",
+  :host => "ubuntu810",
+  :username => "hr",
+  :password => "hr"
+}
+
+JDBC_CONNECTION_PARAMS = {
+  :adapter => "jdbc",
+  :driver => "oracle.jdbc.driver.OracleDriver",
+  :url => "jdbc:oracle:thin:@ubuntu810:1521:XE",
+  :username => "hr",
+  :password => "hr"
+}
+
+SYS_CONNECTION_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => "xe",
+  :host => "ubuntu810",
+  :username => "sys",
+  :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: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-03 00:00:00 +02:00
+date: 2009-03-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,17 +37,26 @@ files:
 - History.txt
 - License.txt
 - README.txt
+- 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
+- lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb
 - lib/active_record/connection_adapters/oracle_enhanced_procedures.rb
+- lib/active_record/connection_adapters/oracle_enhanced_reserved_words.rb
 - 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
+- spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb