activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.9

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -22,7 +22,7 @@ describe "OracleEnhancedAdapter schema dump" do
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
-        t.timestamps
+        t.timestamps null: true
       end
       add_index :test_posts, :title
     end
@@ -180,21 +180,21 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk"/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts"/
     end
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :delete
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :delete/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :cascade/
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :nullify
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :nullify/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :nullify/
     end
 
     it "should not include foreign keys on ignored table names in schema dump" do
@@ -226,6 +226,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include composite foreign keys" do
+      skip "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
@@ -340,7 +341,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
-      @conn.stub!(:default_tablespace).and_return('dummy')
+      @conn.stub(:default_tablespace).and_return('dummy')
       create_test_posts_table
       standard_dump.should =~ /add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/
     end
@@ -368,21 +369,18 @@ describe "OracleEnhancedAdapter schema dump" do
 
   describe 'virtual columns' do
     before(:all) do
-      if @oracle11g_or_higher
-        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.virtual :name_ratio, :as=>'(LENGTH(first_name)/LENGTH(last_name))'
-            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
+      skip "Not supported in this database version" unless @oracle11g_or_higher
+      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.virtual :name_ratio,      :as => '(LENGTH(first_name)*10/LENGTH(last_name)*10)'
+          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
-      else
-        pending "Not supported in this database version"
       end
     end
 
@@ -402,30 +400,13 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    context "when number_datatype_coercion is :float" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-      it 'should dump correctly' do
-        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 "name_ratio",(\s*)as:(.*),(\s*)type: :float$/
-        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 "when number_datatype_coercion is :decimal" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-      it 'should dump correctly' do
-        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 "name_ratio",(\s*)as:(.*)\"$/
-        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
+    it 'should dump correctly' do
+      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*)as:(.*),(\s*)type: :integer/
+      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
+      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
 
     context 'with column cache' do
@@ -471,160 +452,63 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe "NUMBER columns" do
-    after(:each) do
+  describe ":float datatype" do
+    before(:each) do
       schema_define do
-        drop_table "test_numbers"
-      end
-    end
-
-    let(:value_within_max_precision)    { (10 ** @conn.class::NUMBER_MAX_PRECISION) - 1 }
-    let(:value_exceeding_max_precision) { (10 ** @conn.class::NUMBER_MAX_PRECISION) + 1 }
-
-    context "when using ActiveRecord::Schema.define and ActiveRecord::ConnectionAdapters::TableDefinition#float" do
-      before :each do
-        schema_define do
-          create_table :test_numbers, :force => true do |t|
-            t.float :value
-          end
+        create_table :test_floats, force: true do |t|
+          t.float :hourly_rate
         end
       end
+    end
 
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
+    after(:each) do
+      schema_define do
+        drop_table :test_floats
       end
+    end
 
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
+    it "should dump float type correctly" do
+      standard_dump.should =~ /t\.float "hourly_rate"$/
+    end
+  end
 
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
+  describe "table comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_table_comments, :comment => "this is a \"table comment\"!", force: true do |t|
+          t.string :blah
         end
       end
     end
 
-    context "when using handwritten 'CREATE_TABLE' SQL" do
-      before :each do
-        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-        @conn = ActiveRecord::Base.connection
-        @conn.execute <<-SQL
-          CREATE TABLE test_numbers (
-            id     NUMBER(#{@conn.class::NUMBER_MAX_PRECISION},0) PRIMARY KEY,
-            value  NUMBER
-          )
-        SQL
-        @conn.execute <<-SQL
-          CREATE SEQUENCE test_numbers_seq  MINVALUE 1
-            INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
-        SQL
+    after(:each) do
+      schema_define do
+        drop_table :test_table_comments
       end
+    end
 
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
+    it "should dump table comments" do
+      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+    end
+  end
 
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            number2.save!
-          end
+  describe "column comments" do
+    before(:each) do
+      schema_define do
+        create_table :test_column_comments, force: true do |t|
+          t.string :blah, :comment => "this is a \"column comment\"!"
         end
       end
+    end
 
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do |i|
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-
-            # Raises 'ORA-01438' as :value column type isn't FLOAT'ish
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            lambda do
-              number2.save!
-            end.should raise_error() { |e| e.message.should =~ /ORA-01438/ }
-          end
-        end
-      end # context (:decimal)
-
-    end # context (handwritten)
-  end # describe (NUMBER columns)
+    after(:each) do
+      schema_define do
+        drop_table :test_column_comments
+      end
+    end
 
+    it "should dump column comments" do
+      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -423,6 +423,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :new_test_employees rescue nil
         drop_table :test_employees_no_pkey rescue nil
         drop_table :new_test_employees_no_pkey rescue nil
+        drop_table :aaaaaaaaaaaaaaaaaaaaaaaaaaa rescue nil
       end
     end
 
@@ -438,10 +439,10 @@ describe "OracleEnhancedAdapter schema definition" do
       end.should raise_error
     end
 
-    it "should raise error when new sequence name length is too long" do
+    it "should not raise error when new sequence name length is too long" do
       lambda do
         @conn.rename_table("test_employees","a"*27)
-      end.should raise_error
+      end.should_not raise_error
     end
 
     it "should rename table when table has no primary key and sequence" do
@@ -627,25 +628,28 @@ end
     end
 
     it "should add foreign key" do
+      fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_test_post_id_fk").first(10)}"
+
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
       lambda do
         TestComment.create(:body => "test", :test_post_id => 1)
-      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TEST_COMMENTS_TEST_POST_ID_FK/}
+      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
     end
 
     context "with table_name_prefix" do
       let(:table_name_prefix) { 'xxx_' }
 
       it "should use table_name_prefix for foreign table" do
+        fk_name = "fk_rails_#{Digest::SHA256.hexdigest("xxx_test_comments_test_post_id_fk").first(10)}"
         schema_define do
           add_foreign_key :test_comments, :test_posts
         end
 
         lambda do
           TestComment.create(:body => "test", :test_post_id => 1)
-        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.XXX_TES_COM_TES_POS_ID_FK/}
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
       end
     end
 
@@ -653,13 +657,14 @@ end
       let(:table_name_suffix) { '_xxx' }
 
       it "should use table_name_suffix for foreign table" do
+        fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_xxx_test_post_id_fk").first(10)}"
         schema_define do
           add_foreign_key :test_comments, :test_posts
         end
 
         lambda do
           TestComment.create(:body => "test", :test_post_id => 1)
-        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TES_COM_XXX_TES_POS_ID_FK/}
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
       end
     end
 
@@ -678,7 +683,8 @@ end
       end
       lambda do
         TestComment.create(:body => "test", :test_post_id => 1)
-      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TES_COM_TES_POS_ID_FOR_KEY/}
+      end.should raise_error() {|e| e.message.should =~
+        /ORA-02291.*\.C#{Digest::SHA1.hexdigest("test_comments_test_post_id_foreign_key")[0,29].upcase}/}
     end
 
     it "should add foreign key with very long name which is shortened" do
@@ -692,12 +698,14 @@ end
     end
 
     it "should add foreign key with column" do
+      fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_post_id_fk").first(10)}"
+
       schema_define do
         add_foreign_key :test_comments, :test_posts, :column => "post_id"
       end
       lambda do
         TestComment.create(:body => "test", :post_id => 1)
-      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TEST_COMMENTS_POST_ID_FK/}
+      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
     end
 
     it "should add foreign key with delete dependency" do
@@ -721,6 +729,7 @@ end
     end
 
     it "should add a composite foreign key" do
+      skip "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
@@ -743,6 +752,7 @@ end
     end
 
     it "should add a composite foreign key with name" do
+      skip "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
@@ -795,6 +805,92 @@ end
 
   end
 
+  describe "lob in table definition" do
+    before do
+      class ::TestPost < ActiveRecord::Base
+      end
+    end
+    it 'should use default tablespace for clobs' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = DATABASE_NON_DEFAULT_TABLESPACE
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = nil
+      schema_define do
+        create_table :test_posts, :force => true do |t|
+          t.text :test_clob
+          t.binary :test_blob
+        end
+      end
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_CLOB'").should == DATABASE_NON_DEFAULT_TABLESPACE
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'").should_not == DATABASE_NON_DEFAULT_TABLESPACE
+    end
+
+    it 'should use default tablespace for blobs' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:blob] = DATABASE_NON_DEFAULT_TABLESPACE
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = nil
+      schema_define do
+        create_table :test_posts, :force => true do |t|
+          t.text :test_clob
+          t.binary :test_blob
+        end
+      end
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'").should == DATABASE_NON_DEFAULT_TABLESPACE
+      TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_CLOB'").should_not == DATABASE_NON_DEFAULT_TABLESPACE
+    end
+
+    after do
+      Object.send(:remove_const, "TestPost")
+      schema_define do
+        drop_table :test_posts rescue nil
+      end
+    end
+  end
+
+  describe "primary key in table definition" do
+    before do
+      @conn = ActiveRecord::Base.connection
+
+      class ::TestPost < ActiveRecord::Base
+      end
+    end
+
+    it 'should use default tablespace for primary key' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = nil
+      schema_define do
+        create_table :test_posts, :force => true
+      end
+
+      index_name = @conn.select_value(
+        "SELECT index_name FROM all_constraints
+            WHERE table_name = 'TEST_POSTS'
+            AND constraint_type = 'P'
+            AND owner = SYS_CONTEXT('userenv', 'current_schema')")
+
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_indexes WHERE index_name = '#{index_name}'")).to eq('USERS')
+    end
+
+    it 'should use non default tablespace for primary key' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        create_table :test_posts, :force => true
+      end
+
+      index_name = @conn.select_value(
+        "SELECT index_name FROM all_constraints
+            WHERE table_name = 'TEST_POSTS'
+            AND constraint_type = 'P'
+            AND owner = SYS_CONTEXT('userenv', 'current_schema')")
+
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_indexes WHERE index_name = '#{index_name}'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+    end
+
+    after do
+      Object.send(:remove_const, "TestPost")
+      schema_define do
+        drop_table :test_posts rescue nil
+      end
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = nil
+    end
+  end
+
   describe "foreign key in table definition" do
     before(:each) do
       schema_define do
@@ -1020,7 +1116,7 @@ end
         end
       end
       class ::TestPost < ActiveRecord::Base; end
-      TestPost.columns_hash['title'].null.should be_false
+      TestPost.columns_hash['title'].null.should be false
     end
 
     after(:each) do
@@ -1034,7 +1130,7 @@ end
         change_column :test_posts, :title, :string, :null => true
       end
       TestPost.reset_column_information
-      TestPost.columns_hash['title'].null.should be_true
+      TestPost.columns_hash['title'].null.should be true
     end
 
     it "should add column" do
@@ -1110,7 +1206,7 @@ end
 
   describe 'virtual columns in create_table' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g_or_higher
+      skip "Not supported in this database version" unless @oracle11g_or_higher
     end
 
     it 'should create virtual column with old syntax' do
@@ -1156,7 +1252,7 @@ end
 
   describe 'virtual columns' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g_or_higher
+      skip "Not supported in this database version" unless @oracle11g_or_higher
       expr = "( numerator/NULLIF(denominator,0) )*100"
       schema_define do
         create_table :test_fractions, :force => true do |t|
@@ -1359,6 +1455,13 @@ end
       @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
     end
 
+    it "should create unique function index but not create unique constraints" do
+      schema_define do
+        add_index :keyboards, 'lower(name)', unique: true, name: :index_keyboards_on_lower_name
+      end
+      @would_execute_sql.should_not =~ /ALTER +TABLE .* ADD CONSTRAINT .* UNIQUE \(.*\(.*\)\)/
+    end
+
     describe "#initialize_schema_migrations_table" do
       # In Rails 2.3 to 3.2.x the index name for the migrations
       # table is hard-coded. We can modify the index name here

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -92,6 +92,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
     
     it "should dump composite foreign keys" do
+      skip "Composite foreign keys are not supported in this version"
       @conn.add_column :foos, :fooz_id, :integer
       @conn.add_column :foos, :baz_id, :integer
       
@@ -149,7 +150,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
   
     it "should dump virtual columns" do
-      pending "Not supported in this database version" unless @oracle11g_or_higher
+      skip "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -162,6 +163,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     it "should dump RAW virtual columns" do
+      skip "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -224,6 +226,20 @@ describe "OracleEnhancedAdapter structure dump" do
       dump.should =~ /CREATE TABLE \"BARS\" \(\n\"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\)/
     end
 
+    it "should dump table comments" do
+      comment_sql = %Q(COMMENT ON TABLE "TEST_POSTS" IS 'Test posts with ''some'' "quotes"')
+      @conn.execute comment_sql
+      dump = ActiveRecord::Base.connection.structure_dump
+      dump.should =~ /#{comment_sql}/
+    end
+
+    it "should dump column comments" do
+      comment_sql = %Q(COMMENT ON COLUMN "TEST_POSTS"."TITLE" IS 'The title of the post with ''some'' "quotes"')
+      @conn.execute comment_sql
+      dump = ActiveRecord::Base.connection.structure_dump
+      dump.should =~ /#{comment_sql}/
+    end
+
   end
   describe "temporary tables" do
     after(:all) do

data/spec/spec_config.yaml.template

@@ -0,0 +1,11 @@
+# copy this file to spec/config.yaml and set appropriate values
+# you can also use environment variables, see spec_helper.rb
+database:
+  name:         'orcl'
+  host:         '127.0.0.1'
+  port:         1521
+  user:         'oracle_enhanced'
+  password:     'oracle_enhanced'
+  sys_password: 'admin'
+  non_default_tablespace: 'SYSTEM'
+timezone: 'Europe/Riga'