pmacs-activerecord-oracle_enhanced-adapter 1.4.2.rc1 → 1.5.5.1

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -89,11 +89,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
       class ::TestEmployee < ActiveRecord::Base
-        if self.respond_to?(:primary_key=)
-          self.primary_key = "employee_id"
-        else
-          set_primary_key "employee_id"
-        end
+        self.primary_key = "employee_id"
       end
     end
     
@@ -210,6 +206,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         job_id        NUMBER,
         salary        NUMBER,
         commission_pct  NUMBER(2,2),
+        unwise_name_id NUMBER(2,2),
         manager_id    NUMBER(6),
         is_manager    NUMBER(1),
         department_id NUMBER(4,0),
@@ -222,17 +219,46 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
-  
+
   after(:all) do
     @conn.execute "DROP TABLE test2_employees"
     @conn.execute "DROP SEQUENCE test2_employees_seq"
   end
 
-  it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-    columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "job_id"}
-    column.type.should == :decimal
+  context "when number_datatype_coercion is :decimal" do
+    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
+
+    it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+      columns = @conn.columns('test2_employees')
+      column = columns.detect{|c| c.name == "job_id"}
+      column.type.should == :decimal
+    end
+
+    it "should set NUMBER column type as decimal if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
+      columns = @conn.columns('test2_employees')
+      column = columns.detect{|c| c.name == "salary"}
+      column.type.should == :decimal
+    end
+  end
+
+  context "when number_datatype_coercion is :float" do
+    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
+
+    it "should set NUMBER column type as float if emulate_integers_by_column_name is false" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+      columns = @conn.columns('test2_employees')
+      column = columns.detect{|c| c.name == "job_id"}
+      column.type.should == :float
+    end
+
+    it "should set NUMBER column type as float if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
+      columns = @conn.columns('test2_employees')
+      column = columns.detect{|c| c.name == "salary"}
+      column.type.should == :float
+    end
   end
 
   it "should set NUMBER column type as integer if emulate_integers_by_column_name is true" do
@@ -244,10 +270,24 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type.should == :integer
   end
 
-  it "should set NUMBER column type as decimal if column name does not contain 'id' and emulate_integers_by_column_name is true" do
+  it "should set NUMBER(p,0) column type as integer" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "salary"}
+    column = columns.detect{|c| c.name == "department_id"}
+    column.type.should == :integer
+  end
+
+  it "should set NUMBER(p,s) column type as integer if column name ends with '_id' and emulate_integers_by_column_name is true" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "unwise_name_id"}
+    column.type.should == :integer
+  end
+
+  it "should set NUMBER(p,s) column type as decimal if column name ends with '_id' and emulate_integers_by_column_name is false" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "unwise_name_id"}
     column.type.should == :decimal
   end
 
@@ -258,7 +298,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type_cast(1.0).class.should == BigDecimal
   end
 
-  it "should return Fixnum value from NUMBER column if column name contains 'id' and emulate_integers_by_column_name is true" do
+  it "should return Fixnum value from NUMBER column if column name ends with '_id' and emulate_integers_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
     column = columns.detect{|c| c.name == "job_id"}
@@ -270,7 +310,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       class ::Test2Employee < ActiveRecord::Base
       end
     end
-    
+
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
       @conn.clear_types_for_columns
@@ -569,11 +609,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
-        if self.respond_to?(:primary_key=)
-          self.primary_key = "employee_id"
-        else
-          set_primary_key "employee_id"
-        end
+        self.primary_key = "employee_id"
       end
     end
 
@@ -614,7 +650,6 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
 end
 
-
 describe "OracleEnhancedAdapter date and timestamp with different NLS date formats" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -655,11 +690,7 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
     class ::TestEmployee < ActiveRecord::Base
-      if self.respond_to?(:primary_key=)
-        self.primary_key = "employee_id"
-      else
-        set_primary_key "employee_id"
-      end
+      self.primary_key = "employee_id"
     end
     @today = Date.new(2008,6,28)
     @now = Time.local(2008,6,28,13,34,33)
@@ -744,11 +775,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
         INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
     SQL
     class ::TestEmployee < ActiveRecord::Base
-      if self.respond_to?(:primary_key=)
-        self.primary_key = "employee_id"
-      else
-        set_primary_key "employee_id"
-      end
+      self.primary_key = "employee_id"
     end
     @today = Date.new(2008,6,28)
     @today_iso = "2008-06-28"
@@ -879,7 +906,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
-  
+
 end
 
 describe "OracleEnhancedAdapter handling of CLOB columns" do
@@ -918,7 +945,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       serialize :comments
     end
     class ::TestEmployeeReadOnlyClob < ActiveRecord::Base
-      set_table_name :test_employees
+      self.table_name = "test_employees"
       attr_readonly :comments
     end
   end
@@ -1052,6 +1079,18 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.reload
     @employee.comments.should == @char_data
   end
+
+  it "should keep unchanged serialized data when other columns changed" do
+    @employee = Test2Employee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => "initial serialized data"
+    )
+    @employee.first_name = "Steve"
+    @employee.save
+    @employee.reload
+    @employee.comments.should == "initial serialized data"
+  end
 end
 
 describe "OracleEnhancedAdapter handling of BLOB columns" do
@@ -1081,11 +1120,7 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      if self.respond_to?(:primary_key=)
-        self.primary_key = "employee_id"
-      else
-        set_primary_key "employee_id"
-      end
+      self.primary_key = "employee_id"
     end
   end
   
@@ -1211,11 +1246,7 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      if self.respond_to?(:primary_key=)
-        self.primary_key = "employee_id"
-      else
-        set_primary_key "employee_id"
-      end
+      self.primary_key = "employee_id"
     end
   end
 
@@ -1313,7 +1344,6 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
   end
 end
 
-
 describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'active_record/connection_adapters/oracle_enhanced_database_tasks'
+require 'stringio'
+require 'tempfile'
+
+describe "Oracle Enhanced adapter database tasks" do
+  let(:config) { CONNECTION_PARAMS.with_indifferent_access }
+
+  describe "create" do
+    let(:new_user_config) { config.merge({username: "oracle_enhanced_test_user"}) }
+    before do
+      fake_terminal(SYSTEM_CONNECTION_PARAMS[:password]) do
+        ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
+      end
+    end
+    it "creates user" do
+      query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
+      ActiveRecord::Base.connection.select_value(query).should == 1
+    end
+    after do
+      ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}");
+    end
+
+    def fake_terminal(input)
+      $stdin = StringIO.new
+      $stdout = StringIO.new
+      $stdin.puts(input)
+      $stdin.rewind
+      yield
+    ensure
+      $stdin = STDIN
+      $stdout = STDOUT
+    end
+  end
+
+  context "with test table" do
+    before do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+      ActiveRecord::Base.connection.execute "CREATE TABLE test_posts (name VARCHAR2(20))"
+    end
+
+    describe "drop" do
+      before { ActiveRecord::Tasks::DatabaseTasks.drop(config) }
+      it "drops all tables" do
+        ActiveRecord::Base.connection.table_exists?(:test_posts).should be_false
+      end
+    end
+
+    describe "purge" do
+      before { ActiveRecord::Tasks::DatabaseTasks.purge(config) }
+      it "drops all tables" do
+        ActiveRecord::Base.connection.table_exists?(:test_posts).should be_false
+        ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM RECYCLEBIN").should == 0
+      end
+    end
+
+    describe "structure" do
+      let(:temp_file) { Tempfile.new(["oracle_enhanced", ".sql"]).path }
+      before { ActiveRecord::SchemaMigration.create_table }
+
+      describe "structure_dump" do
+        before { ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file) }
+        it "dumps the database structure to a file" do
+          contents = File.read(temp_file)
+          contents.should include('CREATE TABLE "TEST_POSTS"')
+        end
+      end
+
+      describe "structure_load" do
+        before do
+          ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file)
+          ActiveRecord::Tasks::DatabaseTasks.drop(config)
+          ActiveRecord::Tasks::DatabaseTasks.structure_load(config, temp_file)
+        end
+        it "loads the database structure from a file" do
+          ActiveRecord::Base.connection.table_exists?(:test_posts).should be_true
+        end
+      end
+
+      after do
+        File.delete(temp_file)
+        ActiveRecord::SchemaMigration.drop_table
+      end
+    end
+
+    after { ActiveRecord::Base.connection.execute "DROP TABLE test_posts" rescue nil }
+  end
+end
+

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -42,7 +42,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   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}]
+    @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a.should == [{'is_it_long'=>1}]
 
     @logger.output(:debug).should_not match(/^DBMS_OUTPUT/)
   end
@@ -50,7 +50,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").should == [{'is_it_long'=>1}]
+    @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a.should == [{'is_it_long'=>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$/)
@@ -60,7 +60,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    @conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").should == [{'is_it_long'=>0}]
+    @conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a.should == [{'is_it_long'=>0}]
     
     @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -short-$/)
     @logger.output(:debug).should match(/^DBMS_OUTPUT: it is 5 or shorter$/)

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -16,6 +16,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
           last_name     VARCHAR2(25),
           job_id        NUMBER(6,0) NULL,
           salary        NUMBER(8,2),
+          pto_per_hour  NUMBER,
           comments      CLOB,
           hire_date     DATE
         )
@@ -27,7 +28,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       class TestEmployee < ActiveRecord::Base
       end
     end
-  
+
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       @conn.execute "DROP TABLE test_employees"
@@ -62,6 +63,16 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee.should_not be_changed
     end
 
+    it "should not mark empty float (stored as NULL) as changed when reassigning it" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion) { :float }
+      @employee = TestEmployee.create!(:pto_per_hour => '')
+      @employee.pto_per_hour = ''
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.pto_per_hour = ''
+      @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 => nil)
       @employee.comments = nil
@@ -111,7 +122,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee = TestEmployee.new
       @employee.job_id = 0
       @employee.save!.should be_true
-      
+
       @employee.should_not be_changed
 
       @employee.job_id = '0'

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -107,11 +107,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      if self.respond_to?(:primary_key=)
-        self.primary_key = :employee_id
-      else
-        set_primary_key :employee_id
-      end
+      include ActiveRecord::OracleEnhancedProcedures
+      self.primary_key = :employee_id
 
       validates_presence_of :first_name, :last_name, :hire_date
       
@@ -226,9 +223,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.first_name.should == "First"
   end
 
-  it "should not update record if nothing is changed and partial updates are enabled" do
-    return pending("Not in this ActiveRecord version") unless TestEmployee.respond_to?(:partial_updates=)
-    TestEmployee.partial_updates = true
+  it "should not update record if nothing is changed and partial writes are enabled" do
+    TestEmployee.partial_writes = true
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -240,9 +236,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.version.should == 1
   end
 
-  it "should update record if nothing is changed and partial updates are disabled" do
-    return pending("Not in this ActiveRecord version") unless TestEmployee.respond_to?(:partial_updates=)
-    TestEmployee.partial_updates = false
+  it "should update record if nothing is changed and partial writes are disabled" do
+    TestEmployee.partial_writes = false
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -295,6 +290,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     }.should raise_error("Make the transaction rollback")
     @employee.id.should == empl_id
     TestEmployee.find_by_employee_id(empl_id).should_not be_nil
+    clear_logger
   end
 
   it "should set timestamps when creating record" do
@@ -330,10 +326,11 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @logger.logged(:debug).last.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
+    clear_logger
   end
 
   it "should log update record" do
-    (TestEmployee.partial_updates = false) rescue nil
+    (TestEmployee.partial_writes = false) rescue nil
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -342,6 +339,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     set_logger
     @employee.save!
     @logger.logged(:debug).last.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
+    clear_logger
   end
 
   it "should log delete record" do
@@ -353,6 +351,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     set_logger
     @employee.destroy
     @logger.logged(:debug).last.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
+    clear_logger
   end
 
   it "should validate new record before creation" do