activerecord-oracle_enhanced-adapter 1.4.1 → 1.4.2.rc1

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -7,6 +7,8 @@ if ActiveRecord::Base.method_defined?(:changed?)
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       @conn = ActiveRecord::Base.connection
+      @conn.execute "DROP TABLE test_employees" rescue nil
+      @conn.execute "DROP SEQUENCE test_employees_seq" rescue nil
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
           id            NUMBER PRIMARY KEY,
@@ -116,6 +118,24 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee.should_not be_changed
     end
 
+    it "should not update unchanged CLOBs" do
+      @employee = TestEmployee.create!(
+          :comments => "initial"
+      )
+      @employee.save!.should be_true
+      @employee.reload
+      @employee.comments.should == 'initial'
+
+      oci_conn = @conn.instance_variable_get('@connection')
+      class << oci_conn
+         def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
+      end
+      @employee.save!.should_not raise_exception(RuntimeError, "don't do this'")
+      class << oci_conn
+        remove_method :write_lob
+      end
+    end
+
   end
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -107,8 +107,12 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   before(:each) do
     class ::TestEmployee < ActiveRecord::Base
-      set_primary_key :employee_id
-      
+      if self.respond_to?(:primary_key=)
+        self.primary_key = :employee_id
+      else
+        set_primary_key :employee_id
+      end
+
       validates_presence_of :first_name, :last_name, :hire_date
       
       # should return ID of new record

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -34,7 +34,7 @@ describe "OracleEnhancedAdapter schema dump" do
   rescue
     nil
   end
-  
+
   describe "tables" do
     after(:each) do
       drop_test_posts_table
@@ -161,7 +161,7 @@ describe "OracleEnhancedAdapter schema dump" do
         end
       end
     end
-    
+
     after(:each) do
       schema_define do
         remove_foreign_key :test_comments, :test_posts rescue nil
@@ -228,15 +228,15 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
-      
+
         execute <<-SQL
-          ALTER TABLE TEST_POSTS 
+          ALTER TABLE TEST_POSTS
           ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
         SQL
-      
+
         add_column :test_comments, :baz_id, :integer
         add_column :test_comments, :fooz_id, :integer
-      
+
         add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
       end
       standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :columns => \["baz_id", "fooz_id"\], :name => "comments_posts_baz_fooz_fk"/
@@ -300,7 +300,7 @@ describe "OracleEnhancedAdapter schema dump" do
     after(:each) do
       drop_test_posts_table
     end
-    
+
     it "should include temporary options" do
       create_test_posts_table(:temporary => true)
       standard_dump.should =~ /create_table "test_posts", :temporary => true/
@@ -347,34 +347,92 @@ describe "OracleEnhancedAdapter schema dump" do
 
   describe 'virtual columns' do
     before(:all) do
-      oracle11g = @oracle11g
-      schema_define do
-        create_table :test_names, :force => true do |t|
-          t.string :first_name
-          t.string :last_name
-          t.virtual :full_name, :default=>"first_name || ', ' || last_name" if oracle11g
+      if @oracle11g
+        schema_define do
+          create_table :test_names, :force => true do |t|
+            t.string  :first_name
+            t.string  :last_name
+            t.virtual :full_name,        :as => "first_name || ', ' || last_name"
+            t.virtual :short_name,       :as => "COALESCE(first_name, last_name)", :type => :string, :limit => 300
+            t.virtual :abbrev_name,      :as => "SUBSTR(first_name,1,50) || ' ' || SUBSTR(last_name,1,1) || '.'", :type => "VARCHAR(100)"
+            t.column  :full_name_length, :virtual, :as => "length(first_name || ', ' || last_name)", :type => :integer
+            t.virtual :field_with_leading_space, :as => "' ' || first_name || ' '", :limit => 300, :type => :string
+          end
         end
+      else
+        pending "Not supported in this database version"
       end
     end
+
     before(:each) do
-      class ::TestName < ActiveRecord::Base
-        set_table_name "test_names"
+      if @oracle11g
+        class ::TestName < ActiveRecord::Base
+          if self.respond_to?(:table_name=)
+            self.table_name = "test_names"
+          else
+            set_table_name "test_names"
+          end
+        end
       end
     end
 
     after(:all) do
-      schema_define do
-        drop_table :test_names
+      if @oracle11g
+        schema_define do
+          drop_table :test_names
+        end
       end
     end
 
     it 'should dump correctly' do
-      pending "Not supported in this database version" unless @oracle11g
-      standard_dump.should =~ /t.virtual "full_name",(\s*):limit => 512,(\s*):default => "/
+      standard_dump.should =~ /t\.virtual "full_name",(\s*):limit => 512,(\s*):as => "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*):type => :string/
+      standard_dump.should =~ /t\.virtual "short_name",(\s*):limit => 300,(\s*):as =>(.*),(\s*):type => :string/
+      standard_dump.should =~ /t\.virtual "full_name_length",(\s*):precision => 38,(\s*):scale => 0,(\s*):as =>(.*),(\s*):type => :integer/
+      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*):limit => 100,(\s*):as =>(.*),(\s*):type => :string/
+      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*):limit => 300,(\s*):as => "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*):type => :string/
     end
 
-  end
+    context 'with column cache' do
+      before(:all) do
+        @old_cache = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+      end
+      after(:all) do
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = @old_cache
+      end
+      it 'should not change column defaults after several dumps' do
+        col = TestName.columns.detect{|c| c.name == 'full_name'}
+        col.should_not be_nil
+        col.virtual_column_data_default.should_not =~ /:as/
 
+        standard_dump
+        col.virtual_column_data_default.should_not =~ /:as/
 
-end
+        standard_dump
+        col.virtual_column_data_default.should_not =~ /:as/
+      end
+    end
 
+    context "with index on virtual column" do
+      before(:all) do
+        if @oracle11g
+          schema_define do 
+            add_index 'test_names', 'field_with_leading_space', :name => "index_on_virtual_col"
+          end
+        end
+      end
+      after(:all) do
+        if @oracle11g
+          schema_define do
+            remove_index 'test_names', :name => 'index_on_virtual_col'
+          end
+        end
+      end
+      it 'should dump correctly' do
+        standard_dump.should_not =~ /add_index "test_names".+FIRST_NAME.+$/
+        standard_dump.should     =~ /add_index "test_names".+field_with_leading_space.+$/
+      end
+    end
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -22,7 +22,11 @@ describe "OracleEnhancedAdapter schema definition" do
         end
       end
       class ::Keyboard < ActiveRecord::Base
-        set_primary_key :key_number
+        if self.respond_to?(:primary_key=)
+          self.primary_key = :key_number
+        else
+          set_primary_key :key_number
+        end
       end
       class ::IdKeyboard < ActiveRecord::Base
       end
@@ -207,7 +211,7 @@ describe "OracleEnhancedAdapter schema definition" do
         insert_id = @conn.insert("INSERT INTO test_employees (first_name) VALUES ('Raimonds')", nil, "id")
         @conn.select_value("SELECT test_employees_seq.currval FROM dual").should == insert_id
       end
-      
+
       it "should create new record for model" do
         e = TestEmployee.create!(:first_name => 'Raimonds')
         @conn.select_value("SELECT test_employees_seq.currval FROM dual").should == e.id
@@ -222,7 +226,11 @@ describe "OracleEnhancedAdapter schema definition" do
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:primary_key => @primary_key, :sequence_name => @sequence_name)
         class ::TestEmployee < ActiveRecord::Base
-          set_primary_key "employee_id"
+          if self.respond_to?(:primary_key=)
+            self.primary_key = "employee_id"
+          else
+            set_primary_key "employee_id"
+          end
         end
       end
 
@@ -254,7 +262,11 @@ describe "OracleEnhancedAdapter schema definition" do
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:sequence_name => @sequence_name, :trigger_name => "test_employees_t1")
         class ::TestEmployee < ActiveRecord::Base
-          set_sequence_name :autogenerated
+          if self.respond_to?(:sequence_name=)
+            self.sequence_name = :autogenerated
+          else
+            set_sequence_name :autogenerated
+          end
         end
       end
 
@@ -542,7 +554,7 @@ end
         belongs_to :test_post
       end
     end
-    
+
     after(:each) do
       Object.send(:remove_const, "TestPost")
       Object.send(:remove_const, "TestComment")
@@ -618,26 +630,26 @@ end
       TestPost.delete(p.id)
       TestComment.find_by_id(c.id).test_post_id.should be_nil
     end
-    
+
     it "should add a composite foreign key" do
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
-        
+
         execute <<-SQL
-          ALTER TABLE TEST_POSTS 
+          ALTER TABLE TEST_POSTS
           ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
         SQL
-        
+
         add_column :test_comments, :baz_id, :integer
         add_column :test_comments, :fooz_id, :integer
-        
+
         add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"]
       end
-      
+
       lambda do
         TestComment.create(:body => "test", :fooz_id => 1, :baz_id => 1)
-      end.should raise_error() {|e| e.message.should =~ 
+      end.should raise_error() {|e| e.message.should =~
         /ORA-02291.*\.TES_COM_BAZ_ID_FOO_ID_FK/}
     end
 
@@ -645,18 +657,18 @@ end
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
-        
+
         execute <<-SQL
-          ALTER TABLE TEST_POSTS 
+          ALTER TABLE TEST_POSTS
           ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
         SQL
-        
+
         add_column :test_comments, :baz_id, :integer
         add_column :test_comments, :fooz_id, :integer
-        
+
         add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
       end
-      
+
       lambda do
         TestComment.create(:body => "test", :baz_id => 1, :fooz_id => 1)
       end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.COMMENTS_POSTS_BAZ_FOOZ_FK/}
@@ -708,7 +720,7 @@ end
         belongs_to :test_post
       end
     end
-    
+
     after(:each) do
       Object.send(:remove_const, "TestPost")
       Object.send(:remove_const, "TestComment")
@@ -862,7 +874,11 @@ end
 
     before(:each) do
       class ::TestPost < ActiveRecord::Base
-        set_table_name "synonym_to_posts"
+        if self.respond_to?(:table_name=)
+          self.table_name = "synonym_to_posts"
+        else
+          set_table_name "synonym_to_posts"
+        end
       end
     end
 
@@ -918,6 +934,7 @@ end
       schema_define do
         create_table :test_posts, :force => true do |t|
           t.string :title, :null => false
+          t.string :content
         end
       end
       class ::TestPost < ActiveRecord::Base; end
@@ -979,46 +996,197 @@ end
       TestPost.columns_hash['title'].should be_nil
     end
 
+    it "should remove column when using change_table" do
+      schema_define do
+        change_table :test_posts do |t|
+          t.remove :title
+        end
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['title'].should be_nil
+    end
+
+    it "should remove multiple columns when using change_table" do
+      schema_define do
+        change_table :test_posts do |t|
+          t.remove :title, :content
+        end
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['title'].should be_nil
+      TestPost.columns_hash['content'].should be_nil
+    end
+  end
+
+  describe 'virtual columns in create_table' do
+    before(:each) do
+      pending "Not supported in this database version" unless @oracle11g
+    end
+
+    it 'should create virtual column with old syntax' do
+      schema_define do
+        create_table :test_fractions, :force => true do |t|
+          t.integer :field1
+          t.virtual :field2, :default => 'field1 + 1'
+        end
+      end
+      class ::TestFraction < ActiveRecord::Base
+        if self.respond_to?(:table_name=)
+          self.table_name = "test_fractions"
+        else
+          set_table_name "test_fractions"
+        end
+      end
+
+      TestFraction.reset_column_information
+      tf = TestFraction.columns.detect { |c| c.virtual? }
+      tf.should_not be nil
+      tf.name.should == "field2"
+      tf.virtual?.should be true
+      lambda do
+        tf = TestFraction.new(:field1=>10)
+        tf.field2.should be nil # not whatever is in DATA_DEFAULT column
+        tf.save!
+        tf.reload
+      end.should_not raise_error
+      tf.field2.to_i.should == 11
+
+      schema_define do
+        drop_table :test_fractions
+      end
+    end
+
+    it 'should raise error if column expression is not provided' do
+      lambda {
+        schema_define do
+          create_table :test_fractions do |t|
+            t.integer :field1
+            t.virtual :field2
+          end
+        end
+      }.should raise_error
+    end
   end
 
   describe 'virtual columns' do
-    before(:all) do
-      oracle11g = @oracle11g
+    before(:each) do
+      pending "Not supported in this database version" unless @oracle11g
+      expr = "( numerator/NULLIF(denominator,0) )*100"
       schema_define do
-        expr = "( numerator/NULLIF(denominator,0) )*100"
         create_table :test_fractions, :force => true do |t|
           t.integer :numerator, :default=>0
           t.integer :denominator, :default=>0
-          t.virtual :percent, :default=>expr if oracle11g
+          t.virtual :percent, :as => expr
         end
       end
-    end
-    before(:each) do
       class ::TestFraction < ActiveRecord::Base
-        set_table_name "test_fractions"
+        if self.respond_to?(:table_name=)
+          self.table_name = "test_fractions"
+        else
+          set_table_name "test_fractions"
+        end
       end
+      TestFraction.reset_column_information
     end
 
-    after(:all) do
-      schema_define do
-        drop_table :test_fractions
+    after(:each) do
+      if @oracle11g
+        schema_define do
+          drop_table :test_fractions
+        end
       end
     end
 
     it 'should include virtual columns and not try to update them' do
-      pending "Not supported in this database version" unless @oracle11g
       tf = TestFraction.columns.detect { |c| c.virtual? }
       tf.should_not be nil
       tf.name.should == "percent"
       tf.virtual?.should be true
       lambda do
         tf = TestFraction.new(:numerator=>20, :denominator=>100)
-        tf.percent.should==0 # not whatever is in DATA_DEFAULT column
+        tf.percent.should be nil # not whatever is in DATA_DEFAULT column
         tf.save!
         tf.reload
       end.should_not raise_error
       tf.percent.to_i.should == 20
     end
+
+    it 'should add virtual column' do
+      schema_define do
+        add_column :test_fractions, :rem, :virtual, :as => 'remainder(numerator, NULLIF(denominator,0))'
+      end
+      TestFraction.reset_column_information
+      tf = TestFraction.columns.detect { |c| c.name == 'rem' }
+      tf.should_not be nil
+      tf.virtual?.should be true
+      lambda do
+        tf = TestFraction.new(:numerator=>7, :denominator=>5)
+        tf.rem.should be nil
+        tf.save!
+        tf.reload
+      end.should_not raise_error
+      tf.rem.to_i.should == 2
+    end
+
+    it 'should add virtual column with explicit type' do
+      schema_define do
+        add_column :test_fractions, :expression, :virtual, :as => "TO_CHAR(numerator) || '/' || TO_CHAR(denominator)", :type => :string, :limit => 100
+      end
+      TestFraction.reset_column_information
+      tf = TestFraction.columns.detect { |c| c.name == 'expression' }
+      tf.should_not be nil
+      tf.virtual?.should be true
+      tf.type.should be :string
+      tf.limit.should be 100
+      lambda do
+        tf = TestFraction.new(:numerator=>7, :denominator=>5)
+        tf.expression.should be nil
+        tf.save!
+        tf.reload
+      end.should_not raise_error
+      tf.expression.should == '7/5'
+    end
+
+    it 'should change virtual column definition' do
+      schema_define do
+        change_column :test_fractions, :percent, :virtual,
+          :as => "ROUND((numerator/NULLIF(denominator,0))*100, 2)", :type => :decimal, :precision => 15, :scale => 2
+      end
+      TestFraction.reset_column_information
+      tf = TestFraction.columns.detect { |c| c.name == 'percent' }
+      tf.should_not be nil
+      tf.virtual?.should be true
+      tf.type.should be :decimal
+      tf.precision.should be 15
+      tf.scale.should be 2
+      lambda do
+        tf = TestFraction.new(:numerator=>11, :denominator=>17)
+        tf.percent.should be nil
+        tf.save!
+        tf.reload
+      end.should_not raise_error
+      tf.percent.should == '64.71'.to_d
+    end
+
+    it 'should change virtual column type' do
+      schema_define do
+        change_column :test_fractions, :percent, :virtual, :type => :decimal, :precision => 12, :scale => 5
+      end
+      TestFraction.reset_column_information
+      tf = TestFraction.columns.detect { |c| c.name == 'percent' }
+      tf.should_not be nil
+      tf.virtual?.should be true
+      tf.type.should be :decimal
+      tf.precision.should be 12
+      tf.scale.should be 5
+      lambda do
+        tf = TestFraction.new(:numerator=>11, :denominator=>17)
+        tf.percent.should be nil
+        tf.save!
+        tf.reload
+      end.should_not raise_error
+      tf.percent.should == '64.70588'.to_d
+    end
   end
 
   describe "miscellaneous options" do
@@ -1040,7 +1208,7 @@ end
       end
       @conn.instance_eval{ remove_instance_variable :@would_execute_sql }
     end
-    
+
     it "should support the :options option to create_table" do
       schema_define do
         create_table :test_posts, :options=>'NOLOGGING', :force => true do |t|
@@ -1049,7 +1217,7 @@ end
       end
       @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) NOLOGGING/
     end
-    
+
     it "should support the :tablespace option to create_table" do
       schema_define do
         create_table :test_posts, :tablespace=>'bogus', :force => true do |t|
@@ -1085,14 +1253,14 @@ end
         @would_execute_sql.should =~ /CREATE +TABLE .*\(.*\)\s+ORGANIZATION INDEX INITRANS 4 COMPRESS 1 TABLESPACE bogus/
       end
     end
-    
+
     it "should support the :options option to add_index" do
       schema_define do
         add_index :keyboards, :name, :options=>'NOLOGGING'
       end
       @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) NOLOGGING/
     end
-    
+
     it "should support the :tablespace option to add_index" do
       schema_define do
         add_index :keyboards, :name, :tablespace=>'bogus'