activerecord-oracle_enhanced-adapter 1.1.8 → 1.1.9

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+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")
+      @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),
+          salary        NUMBER(8,2),
+          comments      CLOB,
+          hire_date     DATE
+        )
+      SQL
+      @conn.execute <<-SQL
+        CREATE SEQUENCE test_employees_seq  MINVALUE 1
+          INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
+      SQL
+      class TestEmployee < ActiveRecord::Base
+      end
+    end
+  
+    after(:all) do
+      Object.send(:remove_const, "TestEmployee")
+      @conn.execute "DROP TABLE test_employees"
+      @conn.execute "DROP SEQUENCE test_employees_seq"
+    end  
+
+    it "should not mark empty string (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:first_name => '')
+      @employee.first_name = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.first_name = ''
+      @employee.should_not be_changed
+    end
+
+    it "should not mark empty integer (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:job_id => '')
+      @employee.job_id = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.job_id = ''
+      @employee.should_not be_changed
+    end
+
+    it "should not mark empty decimal (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:salary => '')
+      @employee.salary = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.salary = ''
+      @employee.should_not be_changed
+    end
+
+    it "should not mark empty text (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:comments => '')
+      @employee.comments = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.comments = ''
+      @employee.should_not be_changed
+    end
+
+    it "should not mark empty date (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:hire_date => '')
+      @employee.hire_date = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.hire_date = ''
+      @employee.should_not be_changed
+    end
+
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -1,12 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
-  def log_to(stream)
-    ActiveRecord::Base.logger = Logger.new(stream)
-    ActiveRecord::Base.clear_active_connections!
-    ActiveRecord::Base.colorize_logging = false
-    ActiveRecord::Base.logger.level = Logger::DEBUG
-  end
+  include LoggerSpecHelper
   
   before(:all) do
     ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
@@ -228,7 +223,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    @buffer.string.should match(/^TestEmployee Create \(\d+\.\d+\)  custom create method$/)
+    @buffer.string.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
   end
 
   it "should log update record" do
@@ -240,7 +235,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     log_to @buffer
     @employee.save!
-    @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+\)  custom update method with employee_id=#{@employee.id}$/)
+    @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
   end
 
   it "should log delete record" do
@@ -251,7 +246,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     log_to @buffer
     @employee.destroy
-    @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+\)  custom delete method with employee_id=#{@employee.id}$/)
+    @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
   end
 
   it "should validate new record before creation" do

data/spec/spec_helper.rb

@@ -3,15 +3,40 @@ gem 'rspec'
 require 'spec'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-# gem 'activerecord', '=2.0.2'
-# gem 'actionpack', '=2.0.2'
-# gem 'activesupport', '=2.0.2'
-gem 'activerecord', '=2.1.1'
-gem 'actionpack', '=2.1.1'
-gem 'activesupport', '=2.1.1'
+
+if ENV['RAILS_GEM_VERSION'] =~ /^2.0/
+  gem 'activerecord', '=2.0.2'
+  gem 'actionpack', '=2.0.2'
+  gem 'activesupport', '=2.0.2'
+  gem 'composite_primary_keys', '=0.9.93'
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.1/
+  gem 'activerecord', '=2.1.2'
+  gem 'actionpack', '=2.1.2'
+  gem 'activesupport', '=2.1.2'
+  gem 'composite_primary_keys', '=1.0.8'
+else
+  gem 'activerecord', '=2.2.2'
+  gem 'actionpack', '=2.2.2'
+  gem 'activesupport', '=2.2.2'
+  gem 'composite_primary_keys', '=2.2.0'
+end
+
 require 'activerecord'
 require 'actionpack'
 require 'action_controller/session/active_record_store'
 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)
+    ActiveRecord::Base.logger = Logger.new(stream)
+    if ActiveRecord::Base.respond_to?(:connection_pool)
+      ActiveRecord::Base.connection_pool.clear_reloadable_connections!
+    else
+      ActiveRecord::Base.clear_active_connections!
+    end
+    ActiveRecord::Base.colorize_logging = false
+    ActiveRecord::Base.logger.level = Logger::DEBUG
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 +03:00
+date: 2009-01-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: Oracle enhaced adapter for Active Record
 email: 
@@ -40,11 +40,14 @@ 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_cpk.rb
+- lib/active_record/connection_adapters/oracle_enhanced_dirty.rb
 - lib/active_record/connection_adapters/oracle_enhanced_procedures.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_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_procedures_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -71,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oracle-enhanced
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Oracle enhaced adapter for Active Record