activerecord-oracle_enhanced-adapter 1.2.4 → 1.3.0

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 unless defined?(NO_COMPOSITE_PRIMARY_KEYS)
 
 describe "OracleEnhancedAdapter composite_primary_keys support" do
+  include SchemaSpecHelper
 
   before(:all) do
     if defined?(::ActiveRecord::ConnectionAdapters::OracleAdapter)
@@ -31,20 +32,29 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
 
   describe "do not use count distinct" do
     before(:all) do
+      schema_define do
+        create_table :job_history, :primary_key => [:employee_id, :start_date], :force => true do |t|
+          t.integer :employee_id
+          t.date    :start_date
+        end
+      end
       class ::JobHistory < ActiveRecord::Base
         set_table_name "job_history"
         set_primary_keys :employee_id, :start_date
       end
     end
-    
+
     after(:all) do
-      Object.send(:remove_const, 'JobHistory') if defined?(JobHistory)      
+      Object.send(:remove_const, 'JobHistory') if defined?(JobHistory)
+      schema_define do
+        drop_table :job_history
+      end
     end
-    
+
     it "should tell ActiveRecord that count distinct is not supported" do
       ActiveRecord::Base.connection.supports_count_distinct?.should be_false
     end
-  
+
     it "should execute correct SQL COUNT DISTINCT statement on table with composite primary keys" do
       lambda { JobHistory.count(:distinct => true) }.should_not raise_error
     end
@@ -52,19 +62,17 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
 
   describe "table with LOB" do
     before(:all) do
-      ActiveRecord::Schema.define do
-        suppress_messages do
-          create_table  :cpk_write_lobs_test, :primary_key => [:type_category, :date_value], :force => true do |t|
-            t.string  :type_category, :limit => 15, :null => false  
-            t.date    :date_value, :null => false
-            t.text    :results, :null => false
-            t.timestamps
-          end
-          create_table :non_cpk_write_lobs_test, :force => true do |t|
-            t.date    :date_value, :null => false
-            t.text    :results, :null => false
-            t.timestamps
-          end
+      schema_define do
+        create_table  :cpk_write_lobs_test, :primary_key => [:type_category, :date_value], :force => true do |t|
+          t.string  :type_category, :limit => 15, :null => false  
+          t.date    :date_value, :null => false
+          t.text    :results, :null => false
+          t.timestamps
+        end
+        create_table :non_cpk_write_lobs_test, :force => true do |t|
+          t.date    :date_value, :null => false
+          t.text    :results, :null => false
+          t.timestamps
         end
       end
       class ::CpkWriteLobsTest < ActiveRecord::Base
@@ -77,11 +85,9 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
     end
     
     after(:all) do
-      ActiveRecord::Schema.define do
-        suppress_messages do
-          drop_table :cpk_write_lobs_test
-          drop_table :non_cpk_write_lobs_test
-        end
+      schema_define do
+        drop_table :cpk_write_lobs_test
+        drop_table :non_cpk_write_lobs_test
       end
       Object.send(:remove_const, "CpkWriteLobsTest")
       Object.send(:remove_const, "NonCpkWriteLobsTest")

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -6,7 +6,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -192,7 +192,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test2_employees (
-        id   NUMBER,
+        id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -338,7 +338,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test3_employees (
-        id            NUMBER,
+        id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -521,7 +521,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -604,7 +604,7 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -709,7 +709,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         hire_date     DATE,
@@ -750,6 +750,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @today_iso
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -761,6 +762,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @today_nls
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -771,6 +773,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @now_iso
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -783,6 +786,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @now_nls
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -793,6 +797,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @now_iso
     )
+    @employee.last_login_at.should == @now
     @employee.reload
     @employee.last_login_at.should == @now
   end
@@ -805,6 +810,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @now_nls
     )
+    @employee.last_login_at.should == @now
     @employee.reload
     @employee.last_login_at.should == @now
   end
@@ -815,6 +821,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @today_iso
     )
+    @employee.last_login_at.should == @today.to_time
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
@@ -827,6 +834,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @today_nls
     )
+    @employee.last_login_at.should == @today.to_time
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
@@ -839,7 +847,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         comments      CLOB
@@ -849,20 +857,23 @@ 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
-      set_primary_key :employee_id
-    end
   end
   
   after(:all) do
-    Object.send(:remove_const, "TestEmployee")
     @conn.execute "DROP TABLE test_employees"
     @conn.execute "DROP SEQUENCE test_employees_seq"
   end
 
   before(:each) do
+    class ::TestEmployee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
   end
-  
+
+  after(:each) do
+    Object.send(:remove_const, "TestEmployee")
+  end
+
   it "should create record without CLOB data when attribute is serialized" do
     TestEmployee.serialize :comments
     @employee = TestEmployee.create!(
@@ -870,21 +881,6 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       :last_name => "Last"
     )
     @employee.should be_valid
-    TestEmployee.serialized_attributes.delete('comments')
-  end
-
-  it "should order by CLOB column" do
-    @employee = TestEmployee.create!(
-      :first_name => "First",
-      :last_name => "Last",
-      :comments => "comments"
-    )
-    TestEmployee.find(:all, :order => "comments ASC").should_not be_empty
-    TestEmployee.find(:all, :order => " comments ASC ").should_not be_empty
-    TestEmployee.find(:all, :order => "comments").should_not be_empty
-    TestEmployee.find(:all, :order => " comments ").should_not be_empty
-    TestEmployee.find(:all, :order => :comments).should_not be_empty
-    TestEmployee.find(:all, :order => "  first_name DESC,  last_name   ASC   ").should_not be_empty
   end
 
   it "should accept Symbol value for CLOB column" do
@@ -902,7 +898,7 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         binary_data   BLOB

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -4,7 +4,6 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   include LoggerSpecHelper
 
   before(:all) do
-    @buffer = StringIO.new
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     ActiveRecord::Base.connection.execute <<-SQL
     CREATE or REPLACE
@@ -31,18 +30,21 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   end
 
   before(:each) do
-    @buffer = StringIO.new
-    log_to @buffer
+    set_logger
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
 
+  after(:each) do
+    clear_logger
+  end
+
   it "should NOT log dbms output when dbms output is disabled" do
     @conn.disable_dbms_output
 
     @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").should == [{'is_it_long'=>1}]
-    
-    @buffer.string.should_not match(/^DBMS_OUTPUT/)
+
+    @logger.output(:debug).should_not match(/^DBMS_OUTPUT/)
   end
 
   it "should log dbms output lines to the rails log" do
@@ -50,9 +52,9 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
 
     @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").should == [{'is_it_long'=>1}]
     
-    @buffer.string.should match(/^DBMS_OUTPUT: before the if -hi there-$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: it is longer than 5$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: about to return: 1$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -hi there-$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is longer than 5$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 1$/)
   end
 
   it "should log dbms output lines to the rails log" do
@@ -60,8 +62,8 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
 
     @conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").should == [{'is_it_long'=>0}]
     
-    @buffer.string.should match(/^DBMS_OUTPUT: before the if -short-$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: it is 5 or shorter$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: about to return: 0$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -short-$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is 5 or shorter$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 0$/)
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -9,7 +9,7 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
       @conn = ActiveRecord::Base.connection
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
-          id            NUMBER,
+          id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
           job_id        NUMBER(6,0) NULL,

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+require 'ruby-plsql'
+
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
   include LoggerSpecHelper
   
@@ -10,7 +12,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @conn.execute("DROP TABLE test_employees") rescue nil
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         hire_date     DATE,
@@ -78,9 +80,10 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         BEGIN
           SELECT version INTO v_version FROM test_employees WHERE employee_id = p_employee_id FOR UPDATE;
           UPDATE test_employees
-          SET employee_id = p_employee_id, first_name = p_first_name, last_name = p_last_name,
+          SET first_name = p_first_name, last_name = p_last_name,
               hire_date = p_hire_date, salary = p_salary, description = p_description,
-              version = v_version + 1, update_time = SYSDATE;
+              version = v_version + 1, update_time = SYSDATE
+          WHERE employee_id = p_employee_id;
         END update_employee;
         
         PROCEDURE delete_employee(
@@ -93,7 +96,16 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     SQL
 
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+  end
 
+  after(:all) do
+    @conn = ActiveRecord::Base.connection
+    @conn.execute "DROP TABLE test_employees"
+    @conn.execute "DROP SEQUENCE test_employees_s"
+    @conn.execute "DROP PACKAGE test_employees_pkg"
+  end
+
+  before(:each) do
     class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
       
@@ -130,22 +142,21 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         )
       end
 
+      private
+
+      def raise_make_transaction_rollback
+        raise "Make the transaction rollback"
+      end
     end
-  end
-  
-  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"
-  end
 
-  before(:each) do
     @today = Date.new(2008,6,28)
     @buffer = StringIO.new
   end
 
+  after(:each) do
+    Object.send(:remove_const, "TestEmployee")
+  end
+
   it "should create record" do
     @employee = TestEmployee.create(
       :first_name => "First",
@@ -162,22 +173,19 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should rollback record when exception is raised in after_create callback" do
+    TestEmployee.after_create :raise_make_transaction_rollback
+
     @employee = TestEmployee.new(
       :first_name => "First",
       :last_name => "Last",
       :hire_date => @today
     )
-    TestEmployee.class_eval { def after_create() raise "Make the transaction rollback" end }
-    begin
-      employees_count = TestEmployee.count
-      lambda {
-        @employee.save
-      }.should raise_error("Make the transaction rollback")
-      @employee.id.should == nil
-      TestEmployee.count.should == employees_count
-    ensure
-      TestEmployee.class_eval { remove_method :after_create }
-    end
+    employees_count = TestEmployee.count
+    lambda {
+      @employee.save
+    }.should raise_error("Make the transaction rollback")
+    @employee.id.should == nil
+    TestEmployee.count.should == employees_count
   end
 
   it "should update record" do
@@ -195,25 +203,22 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should rollback record when exception is raised in after_update callback" do
-    TestEmployee.class_eval { def after_update() raise "Make the transaction rollback" end }
-    begin
-      @employee = TestEmployee.create(
-        :first_name => "First",
-        :last_name => "Last",
-        :hire_date => @today,
-        :description => "description"
-      )
-      empl_id = @employee.id
-      @employee.reload
-      @employee.first_name = "Second"
-      lambda {
-        @employee.save
-      }.should raise_error("Make the transaction rollback")
-      @employee.reload
-      @employee.first_name.should == "First"
-    ensure
-      TestEmployee.class_eval { remove_method :after_update }
-    end
+    TestEmployee.after_update :raise_make_transaction_rollback
+
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today,
+      :description => "description"
+    )
+    empl_id = @employee.id
+    @employee.reload
+    @employee.first_name = "Second"
+    lambda {
+      @employee.save
+    }.should raise_error("Make the transaction rollback")
+    @employee.reload
+    @employee.first_name.should == "First"
   end
 
   it "should not update record if nothing is changed and partial updates are enabled" do
@@ -269,24 +274,22 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.should be_destroyed
   end
 
-  it "should rollback record when exception is raised in after_desotry callback" do
-    TestEmployee.class_eval { def after_destroy() raise "Make the transaction rollback" end }
-    begin
-      @employee = TestEmployee.create(
-        :first_name => "First",
-        :last_name => "Last",
-        :hire_date => @today
-      )
-      @employee.reload
-      empl_id = @employee.id
-      lambda {
-        @employee.destroy
-      }.should raise_error("Make the transaction rollback")
-      @employee.id.should == empl_id
-      TestEmployee.find_by_employee_id(empl_id).should_not be_nil
-    ensure
-      TestEmployee.class_eval { remove_method :after_destroy }
-    end
+  it "should rollback record when exception is raised in after_destroy callback" do
+    set_logger
+    TestEmployee.after_destroy :raise_make_transaction_rollback
+
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today
+    )
+    @employee.reload
+    empl_id = @employee.id
+    lambda {
+      @employee.destroy
+    }.should raise_error("Make the transaction rollback")
+    @employee.id.should == empl_id
+    TestEmployee.find_by_employee_id(empl_id).should_not be_nil
   end
 
   it "should set timestamps when creating record" do
@@ -315,13 +318,13 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should log create record" do
-    log_to @buffer
+    set_logger
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
       :hire_date => @today
     )
-    @buffer.string.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
   end
 
   it "should log update record" do
@@ -331,9 +334,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    log_to @buffer
+    set_logger
     @employee.save!
-    @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
   end
 
   it "should log delete record" do
@@ -342,9 +345,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    log_to @buffer
+    set_logger
     @employee.destroy
-    @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
   end
 
   it "should validate new record before creation" do
@@ -353,7 +356,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @employee.save.should be_false
-    @employee.errors.on(:first_name).should_not be_nil
+    @employee.errors[:first_name].should_not be_blank
   end
 
   it "should validate existing record before update" do
@@ -364,7 +367,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     @employee.first_name = nil
     @employee.save.should be_false
-    @employee.errors.on(:first_name).should_not be_nil
+    @employee.errors[:first_name].should_not be_blank
   end
   
 end