activerecord-oracle_enhanced-adapter 1.3.2 → 1.4.0

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -5,6 +5,7 @@ describe "OracleEnhancedAdapter schema definition" do
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @oracle11g = !! ActiveRecord::Base.connection.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
   end
 
   describe "table and sequence creation with non-default primary key" do
@@ -34,6 +35,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
       Object.send(:remove_const, "Keyboard")
       Object.send(:remove_const, "IdKeyboard")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should create sequence for non-default primary key" do
@@ -78,6 +80,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees
       end
       Object.send(:remove_const, "TestEmployee")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should use default sequence start value 10000" do
@@ -149,6 +152,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
       Object.send(:remove_const, "TestEmployee")
       @conn.clear_prefetch_primary_key
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     describe "with default primary key" do
@@ -173,7 +177,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
@@ -298,6 +302,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
       Object.send(:remove_const, "TestEmployee")
       ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should create table with table comment" do
@@ -359,6 +364,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees
       end
       Object.send(:remove_const, "TestEmployee")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should create table trigger with :new reference" do
@@ -402,6 +408,52 @@ describe "OracleEnhancedAdapter schema definition" do
 
   end
 
+  describe "rename index" do
+    before(:each) do
+      @conn = ActiveRecord::Base.connection
+        schema_define do
+          create_table  :test_employees do |t|
+            t.string    :first_name
+            t.string    :last_name
+          end
+          add_index :test_employees, :first_name
+      end
+      class ::TestEmployee < ActiveRecord::Base; end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_employees
+      end
+      Object.send(:remove_const, "TestEmployee")
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    end
+
+    it "should raise error when current index name and new index name are identical" do
+      lambda do
+        @conn.rename_index("test_employees","i_test_employees_first_name","i_test_employees_first_name")
+      end.should raise_error
+    end
+
+    it "should raise error when new index name length is too long" do
+      lambda do
+        @conn.rename_index("test_employees","i_test_employees_first_name","a"*31)
+      end.should raise_error
+    end
+
+    it "should raise error when current index name does not exist" do
+      lambda do
+        @conn.rename_index("test_employees","nonexist_index_name","new_index_name")
+      end.should raise_error
+    end
+
+    it "should rename index name with new one" do
+      lambda do
+        @conn.rename_index("test_employees","i_test_employees_first_name","new_index_name")
+      end.should_not raise_error
+    end
+end
+
   describe "ignore options for LOB columns" do
     after(:each) do
       schema_define do
@@ -458,6 +510,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should add foreign key" do
@@ -623,6 +676,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should add foreign key in create_table" do
@@ -778,6 +832,7 @@ describe "OracleEnhancedAdapter schema definition" do
         remove_synonym :synonym_to_posts
         remove_synonym :synonym_to_posts_seq
       end
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should create synonym to table and sequence" do
@@ -828,6 +883,7 @@ describe "OracleEnhancedAdapter schema definition" do
     after(:each) do
       Object.send(:remove_const, "TestPost")
       schema_define { drop_table :test_posts }
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
     it "should change column to nullable" do
@@ -846,6 +902,24 @@ describe "OracleEnhancedAdapter schema definition" do
       TestPost.columns_hash['body'].should_not be_nil
     end
 
+    it "should add lob column with non_default tablespace" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:clob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        add_column :test_posts, :body, :text
+      end
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'BODY'").should == DATABASE_NON_DEFAULT_TABLESPACE
+    end
+
+    it "should add blob column with non_default tablespace" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:blob)
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        add_column :test_posts, :attachment, :binary
+      end
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'ATTACHMENT'").should == DATABASE_NON_DEFAULT_TABLESPACE
+    end
+
     it "should rename column" do
       schema_define do
         rename_column :test_posts, :title, :subject
@@ -865,6 +939,45 @@ describe "OracleEnhancedAdapter schema definition" do
 
   end
 
+  describe 'virtual columns' do
+    before(:all) do
+      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
+        end
+      end
+    end
+    before(:each) do
+      class ::TestFraction < ActiveRecord::Base
+        set_table_name "test_fractions"
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_fractions
+      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.save!
+        tf.reload
+      end.should_not raise_error
+      tf.percent.to_i.should == 20
+    end
+  end
+
   describe "miscellaneous options" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -902,6 +1015,33 @@ describe "OracleEnhancedAdapter schema definition" do
       end
       @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) TABLESPACE bogus/
     end
+
+    describe "creating a table with a tablespace defaults set" do
+      after(:each) do
+        @conn.drop_table :tablespace_tests rescue nil
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
+      end
+      it "should use correct tablespace" do
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = DATABASE_NON_DEFAULT_TABLESPACE
+        @conn.create_table :tablespace_tests do |t|
+          t.integer :id
+        end
+        @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
+      end
+    end
+
+    describe "creating an index-organized table" do
+      after(:each) do
+        @conn.drop_table :tablespace_tests rescue nil
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:table)
+      end
+      it "should use correct tablespace" do
+        @conn.create_table :tablespace_tests, :id=>false, :organization=>'INDEX INITRANS 4 COMPRESS 1', :tablespace=>'bogus' do |t|
+          t.integer :id
+        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
@@ -916,5 +1056,14 @@ describe "OracleEnhancedAdapter schema definition" do
       end
       @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE bogus/
     end
+
+    it "should use default_tablespaces in add_index" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        add_index :keyboards, :name
+      end
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:index)
+      @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
+    end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -6,6 +6,7 @@ describe "OracleEnhancedAdapter structure dump" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
+    @oracle11g = !! @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
   end
   describe "structure dump" do
     before(:each) do
@@ -138,7 +139,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
   
     it "should dump virtual columns" do
-      pending "Not supported in this database version" unless @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+      pending "Not supported in this database version" unless @oracle11g
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -147,9 +148,9 @@ describe "OracleEnhancedAdapter structure dump" do
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      dump.should =~ /ID_PLUS NUMBER GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/
+      dump.should =~ /\"?ID_PLUS\"? NUMBER GENERATED ALWAYS AS \(ID\+2\) VIRTUAL/
     end
-  
+
     it "should dump unique keys" do
       @conn.execute <<-SQL
         ALTER TABLE test_posts
@@ -319,4 +320,4 @@ describe "OracleEnhancedAdapter structure dump" do
       drop.should_not =~ /DROP TABLE "?FULL_DROP_TEST"? CASCADE CONSTRAINTS/i
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ elsif RUBY_ENGINE == 'jruby'
 end
 
 ENV['RAILS_GEM_VERSION'] ||= '3.1-master'
-NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5'
+NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5' || ENV['RAILS_GEM_VERSION'] =~ /^2\.3\.1\d$/
 
 puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
 
@@ -184,6 +184,8 @@ SYSTEM_CONNECTION_PARAMS = {
   :password => DATABASE_SYS_PASSWORD
 }
 
+DATABASE_NON_DEFAULT_TABLESPACE = ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYSTEM"
+
 # Set default $KCODE to UTF8
 $KCODE = "UTF8"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +02:00
+date: 2011-08-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id001
-  prerelease: false
   name: jeweler
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +47,12 @@ dependencies:
         - 2
         - 4
         version: "2.4"
-  requirement: *id002
-  prerelease: false
   name: rspec
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   name: activerecord
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +75,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
   name: activemodel
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +89,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   name: activesupport
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,12 +103,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  prerelease: false
   name: actionpack
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,12 +117,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  prerelease: false
   name: railties
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,26 +131,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-  prerelease: false
   name: arel
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
   prerelease: false
-  name: rack
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,12 +147,12 @@ dependencies:
         - 4
         - 4
         version: 0.4.4
-  requirement: *id010
-  prerelease: false
   name: ruby-plsql
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,9 +163,8 @@ dependencies:
         - 0
         - 4
         version: 2.0.4
-  requirement: *id011
-  prerelease: false
   name: ruby-oci8
+  version_requirements: *id010
 description: |
   Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
   This adapter is superset of original ActiveRecord Oracle adapter.
@@ -189,14 +175,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
 - .rspec
 - Gemfile
 - History.txt
 - License.txt
-- README.rdoc
-- RUNNING_TESTS.rdoc
+- README.md
+- RUNNING_TESTS.md
 - Rakefile
 - VERSION
 - activerecord-oracle_enhanced-adapter.gemspec
@@ -266,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord