activerecord-oracle_enhanced-adapter 1.7.11 → 1.8.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter schema dump" do
   include SchemaSpecHelper
 
@@ -12,7 +10,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
   def standard_dump(options = {})
     stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables]||[]
+    ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables] || []
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string
   end
@@ -78,43 +76,43 @@ describe "OracleEnhancedAdapter schema dump" do
       drop_test_posts_table
       @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
       @conn.drop_table(ActiveRecord::InternalMetadata.table_name) if @conn.table_exists?(ActiveRecord::InternalMetadata.table_name)
-      ActiveRecord::Base.table_name_prefix = ''
-      ActiveRecord::Base.table_name_suffix = ''
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.table_name_suffix = ""
     end
 
     it "should remove table prefix in schema dump" do
-      ActiveRecord::Base.table_name_prefix = 'xxx_'
+      ActiveRecord::Base.table_name_prefix = "xxx_"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
     it "should remove table prefix with $ sign in schema dump" do
-      ActiveRecord::Base.table_name_prefix = 'xxx$'
+      ActiveRecord::Base.table_name_prefix = "xxx$"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
     it "should remove table suffix in schema dump" do
-      ActiveRecord::Base.table_name_suffix = '_xxx'
+      ActiveRecord::Base.table_name_suffix = "_xxx"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
     it "should remove table suffix with $ sign in schema dump" do
-      ActiveRecord::Base.table_name_suffix = '$xxx'
+      ActiveRecord::Base.table_name_suffix = "$xxx"
       create_test_posts_table
-      expect(standard_dump).to match(/create_table "test_posts".*add_index "test_posts"/m)
+      expect(standard_dump).to match(/create_table "test_posts"/m)
     end
 
     it "should not include schema_migrations table with prefix in schema dump" do
-      ActiveRecord::Base.table_name_prefix = 'xxx_'
-      @conn.initialize_schema_migrations_table
+      ActiveRecord::Base.table_name_prefix = "xxx_"
+      ActiveRecord::SchemaMigration.create_table
       expect(standard_dump).not_to match(/schema_migrations/)
     end
 
     it "should not include schema_migrations table with suffix in schema dump" do
-      ActiveRecord::Base.table_name_suffix = '_xxx'
-      @conn.initialize_schema_migrations_table
+      ActiveRecord::Base.table_name_suffix = "_xxx"
+      ActiveRecord::SchemaMigration.create_table
       expect(standard_dump).not_to match(/schema_migrations/)
     end
 
@@ -126,7 +124,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include non-default primary key in schema dump" do
-      create_test_posts_table(primary_key: 'post_id')
+      create_test_posts_table(primary_key: "post_id")
       expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id"/)
     end
 
@@ -145,7 +143,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include primary key trigger with non-default primary key in schema dump" do
-      create_test_posts_table(primary_key_trigger: true, primary_key: 'post_id')
+      create_test_posts_table(primary_key_trigger: true, primary_key: "post_id")
       expect(standard_dump).to match(/create_table "test_posts", primary_key: "post_id".*add_primary_key_trigger "test_posts", primary_key: "post_id"/m)
     end
 
@@ -167,7 +165,7 @@ describe "OracleEnhancedAdapter schema dump" do
     after(:each) do
       schema_define do
         remove_foreign_key :test_comments, :test_posts rescue nil
-        remove_foreign_key :test_comments, name: 'comments_posts_baz_fooz_fk' rescue nil
+        remove_foreign_key :test_comments, name: "comments_posts_baz_fooz_fk" rescue nil
       end
     end
     after(:all) do
@@ -186,14 +184,14 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, dependent: :delete
+        add_foreign_key :test_comments, :test_posts, on_delete: :cascade
       end
       expect(standard_dump).to match(/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
+        add_foreign_key :test_comments, :test_posts, on_delete: :nullify
       end
       expect(standard_dump).to match(/add_foreign_key "test_comments", "test_posts", on_delete: :nullify/)
     end
@@ -238,7 +236,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should include primary_key when reference column name is not 'id'" do
       schema_define do
-        create_table :test_posts, force: true, :primary_key => 'baz_id' do |t|
+        create_table :test_posts, force: true, primary_key: "baz_id" do |t|
           t.string :title
         end
         create_table :test_comments, force: true do |t|
@@ -319,20 +317,20 @@ describe "OracleEnhancedAdapter schema dump" do
 
     it "should not specify default tablespace in add index" do
       create_test_posts_table
-      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title"$/)
+      expect(standard_dump).to match(/t\.index \["title"\], name: "index_test_posts_on_title"$/)
     end
 
     it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
-      allow(@conn).to receive(:default_tablespace).and_return('dummy')
+      allow(@conn).to receive(:default_tablespace).and_return("dummy")
       create_test_posts_table
-      expect(standard_dump).to match(/add_index "test_posts", \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
+      expect(standard_dump).to match(/t\.index \["title"\], name: "index_test_posts_on_title", tablespace: "#{tablespace_name}"$/)
     end
 
     it "should create and dump function-based indexes" do
       create_test_posts_table
       @conn.add_index :test_posts, "NVL(created_at, updated_at)", name: "index_test_posts_cr_upd_at"
-      expect(standard_dump).to match(/add_index "test_posts", \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
+      expect(standard_dump).to match(/t\.index \["NVL\(\\"CREATED_AT\\",\\"UPDATED_AT\\"\)"\], name: "index_test_posts_cr_upd_at"$/)
     end
 
   end
@@ -350,19 +348,19 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe 'virtual columns' do
+  describe "virtual columns" do
     before(:all) do
       skip "Not supported in this database version" unless @oracle11g_or_higher
       schema_define do
-        create_table :test_names, :force => true do |t|
+        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
+          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
       end
     end
@@ -383,16 +381,16 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    it 'should dump correctly' do
-      expect(standard_dump).to match(/t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "full_name_length",(\s*)precision: 38,(\s*)as:(.*),(\s*)type: :integer/)
+    it "should dump correctly" do
+      expect(standard_dump).to match(/t\.virtual "full_name",(\s*)type: :string,(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\""/)
+      expect(standard_dump).to match(/t\.virtual "short_name",(\s*)type: :string,(\s*)limit: 300,(\s*)as:(.*)/)
+      expect(standard_dump).to match(/t\.virtual "full_name_length",(\s*)type: :integer,(\s*)precision: 38,(\s*)as:(.*)/)
       expect(standard_dump).to match(/t\.virtual "name_ratio",(\s*)as:(.*)\"$/) # no :type
-      expect(standard_dump).to match(/t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/)
-      expect(standard_dump).to match(/t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/)
+      expect(standard_dump).to match(/t\.virtual "abbrev_name",(\s*)type: :string,(\s*)limit: 100,(\s*)as:(.*)/)
+      expect(standard_dump).to match(/t\.virtual "field_with_leading_space",(\s*)type: :string,(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '"/)
     end
 
-    context 'with column cache' do
+    context "with column cache" do
       before(:all) do
         @old_cache = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
@@ -400,8 +398,8 @@ describe "OracleEnhancedAdapter schema dump" do
       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'}
+      it "should not change column defaults after several dumps" do
+        col = TestName.columns.detect { |c| c.name == "full_name" }
         expect(col).not_to be_nil
         expect(col.virtual_column_data_default).not_to match(/:as/)
 
@@ -417,20 +415,20 @@ describe "OracleEnhancedAdapter schema dump" do
       before(:all) do
         if @oracle11g_or_higher
           schema_define do
-            add_index 'test_names', 'field_with_leading_space', :name => "index_on_virtual_col"
+            add_index "test_names", "field_with_leading_space", name: "index_on_virtual_col"
           end
         end
       end
       after(:all) do
         if @oracle11g_or_higher
           schema_define do
-            remove_index 'test_names', :name => 'index_on_virtual_col'
+            remove_index "test_names", name: "index_on_virtual_col"
           end
         end
       end
-      it 'should dump correctly' do
-        expect(standard_dump).not_to match(/add_index "test_names".+FIRST_NAME.+$/)
-        expect(standard_dump).to     match(/add_index "test_names".+field_with_leading_space.+$/)
+      it "should dump correctly" do
+        expect(standard_dump).not_to match(/t\.index .+FIRST_NAME.+$/)
+        expect(standard_dump).to     match(/t\.index .+field_with_leading_space.+$/)
       end
     end
   end
@@ -458,7 +456,7 @@ describe "OracleEnhancedAdapter schema dump" do
   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|
+        create_table :test_table_comments, comment: "this is a \"table comment\"!", force: true do |t|
           t.string :blah
         end
       end
@@ -471,7 +469,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump table comments" do
-      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+      expect(standard_dump).to match(/comment: "this is a \\"table comment\\"!"/)
     end
   end
 
@@ -479,7 +477,7 @@ describe "OracleEnhancedAdapter schema dump" 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\"!"
+          t.string :blah, comment: "this is a \"column comment\"!"
         end
       end
     end
@@ -491,47 +489,8 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should dump column comments" do
-      standard_dump.should =~ /comment: "this is a \\"column comment\\"!"/
-    end
-  end
-
-  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
-
-    after(:each) do
-      schema_define do
-        drop_table :test_table_comments
-      end
-    end
-
-    it "should dump table comments" do
-      standard_dump.should =~ /comment: "this is a \\"table comment\\"!"/
+      expect(standard_dump).to match(/comment: "this is a \\"column comment\\"!"/)
     end
   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
-
-    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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter schema definition" do
   include SchemaSpecHelper
   include LoggerSpecHelper
@@ -10,11 +8,11 @@ describe "OracleEnhancedAdapter schema definition" do
       "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
 
-  describe 'option to create sequence when adding a column' do
+  describe "option to create sequence when adding a column" do
     before do
       @conn = ActiveRecord::Base.connection
       schema_define do
-        create_table :keyboards, :force => true, :id  => false do |t|
+        create_table :keyboards, force: true, id: false do |t|
           t.string      :name
         end
         add_column :keyboards, :id, :primary_key
@@ -22,7 +20,7 @@ describe "OracleEnhancedAdapter schema definition" do
       class ::Keyboard < ActiveRecord::Base; end
     end
 
-    it 'creates a sequence when adding a column with create_sequence = true' do
+    it "creates a sequence when adding a column with create_sequence = true" do
       _, sequence_name = ActiveRecord::Base.connection.pk_and_sequence_for_without_cache(:keyboards)
 
       expect(sequence_name).to eq(Keyboard.sequence_name)
@@ -34,11 +32,11 @@ describe "OracleEnhancedAdapter schema definition" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
       schema_define do
-        create_table :keyboards, :force => true, :id  => false do |t|
+        create_table :keyboards, force: true, id: false do |t|
           t.primary_key :key_number
           t.string      :name
         end
-        create_table :id_keyboards, :force => true do |t|
+        create_table :id_keyboards, force: true do |t|
           t.string      :name
         end
       end
@@ -56,7 +54,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!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should create sequence for non-default primary key" do
@@ -72,7 +70,7 @@ describe "OracleEnhancedAdapter schema definition" do
 
     it "should return sequence name without truncating too much" do
       seq_name_length = ActiveRecord::Base.connection.sequence_name_length
-      tname = "#{DATABASE_USER}" + "." + "a"*(seq_name_length - DATABASE_USER.length) + "z"*(DATABASE_USER).length
+      tname = "#{DATABASE_USER}" + "." + "a" * (seq_name_length - DATABASE_USER.length) + "z" * (DATABASE_USER).length
       expect(ActiveRecord::Base.connection.default_sequence_name(tname)).to match (/z_seq$/)
     end
   end
@@ -81,7 +79,7 @@ describe "OracleEnhancedAdapter schema definition" do
 
     def create_test_employees_table(sequence_start_value = nil)
       schema_define do
-        create_table :test_employees, sequence_start_value ? {:sequence_start_value => sequence_start_value} : {} do |t|
+        create_table :test_employees, sequence_start_value ? { sequence_start_value: sequence_start_value } : {} do |t|
           t.string      :first_name
           t.string      :last_name
         end
@@ -110,7 +108,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!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should use default sequence start value 10000" do
@@ -155,7 +153,7 @@ describe "OracleEnhancedAdapter schema definition" do
 
   describe "create table with primary key trigger" do
     def create_table_with_trigger(options = {})
-      options.merge! :primary_key_trigger => true, :force => true
+      options.merge! primary_key_trigger: true, force: true
       schema_define do
         create_table :test_employees, options do |t|
           t.string      :first_name
@@ -165,7 +163,7 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     def create_table_and_separately_trigger(options = {})
-      options.merge! :force => true
+      options.merge! force: true
       schema_define do
         create_table :test_employees, options do |t|
           t.string      :first_name
@@ -178,11 +176,11 @@ describe "OracleEnhancedAdapter schema definition" do
     def drop_table_with_trigger(options = {})
       seq_name = options[:sequence_name]
       schema_define do
-        drop_table :test_employees, (seq_name ? {:sequence_name => seq_name} : {})
+        drop_table :test_employees, (seq_name ? { sequence_name: seq_name } : {})
       end
       Object.send(:remove_const, "TestEmployee")
       @conn.clear_prefetch_primary_key
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     describe "with default primary key" do
@@ -209,7 +207,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
 
       it "should create new record for model" do
-        e = TestEmployee.create!(:first_name => 'Raimonds')
+        e = TestEmployee.create!(first_name: "Raimonds")
         expect(@conn.select_value("SELECT test_employees_seq.currval FROM dual")).to eq(e.id)
       end
 
@@ -248,7 +246,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
 
       it "should create new record for model" do
-        e = TestEmployee.create!(:first_name => 'Raimonds')
+        e = TestEmployee.create!(first_name: "Raimonds")
         expect(@conn.select_value("SELECT test_employees_seq.currval FROM dual")).to eq(e.id)
       end
     end
@@ -259,14 +257,14 @@ describe "OracleEnhancedAdapter schema definition" do
         @conn = ActiveRecord::Base.connection
         @primary_key = "employee_id"
         @sequence_name = "test_employees_s"
-        create_table_with_trigger(:primary_key => @primary_key, :sequence_name => @sequence_name)
+        create_table_with_trigger(primary_key: @primary_key, sequence_name: @sequence_name)
         class ::TestEmployee < ActiveRecord::Base
           self.primary_key = "employee_id"
         end
       end
 
       after(:all) do
-        drop_table_with_trigger(:sequence_name => @sequence_name)
+        drop_table_with_trigger(sequence_name: @sequence_name)
       end
 
       it "should populate primary key using trigger" do
@@ -281,7 +279,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
 
       it "should create new record for model with autogenerated sequence option" do
-        e = TestEmployee.create!(:first_name => 'Raimonds')
+        e = TestEmployee.create!(first_name: "Raimonds")
         expect(@conn.select_value("SELECT #{@sequence_name}.currval FROM dual")).to eq(e.id)
       end
     end
@@ -291,14 +289,14 @@ describe "OracleEnhancedAdapter schema definition" do
         ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
         @conn = ActiveRecord::Base.connection
         @sequence_name = "test_employees_s"
-        create_table_with_trigger(:sequence_name => @sequence_name, :trigger_name => "test_employees_t1")
+        create_table_with_trigger(sequence_name: @sequence_name, trigger_name: "test_employees_t1")
         class ::TestEmployee < ActiveRecord::Base
           self.sequence_name = :autogenerated
         end
       end
 
       after(:all) do
-        drop_table_with_trigger(:sequence_name => @sequence_name)
+        drop_table_with_trigger(sequence_name: @sequence_name)
       end
 
       it "should populate primary key using trigger" do
@@ -313,7 +311,7 @@ describe "OracleEnhancedAdapter schema definition" do
       end
 
       it "should create new record for model with autogenerated sequence option" do
-        e = TestEmployee.create!(:first_name => 'Raimonds')
+        e = TestEmployee.create!(first_name: "Raimonds")
         expect(@conn.select_value("SELECT #{@sequence_name}.currval FROM dual")).to eq(e.id)
       end
     end
@@ -322,11 +320,11 @@ describe "OracleEnhancedAdapter schema definition" do
 
   describe "table and column comments" do
 
-    def create_test_employees_table(table_comment=nil, column_comments={})
+    def create_test_employees_table(table_comment = nil, column_comments = {})
       schema_define do
-        create_table :test_employees, :comment => table_comment do |t|
-          t.string      :first_name, :comment => column_comments[:first_name]
-          t.string      :last_name, :comment => column_comments[:last_name]
+        create_table :test_employees, comment: table_comment do |t|
+          t.string      :first_name, comment: column_comments[:first_name]
+          t.string      :last_name, comment: column_comments[:last_name]
         end
       end
     end
@@ -340,8 +338,8 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees
       end
       Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.table_name_prefix = ''
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should create table with table comment" do
@@ -350,39 +348,35 @@ describe "OracleEnhancedAdapter schema definition" do
       class ::TestEmployee < ActiveRecord::Base; end
 
       expect(@conn.table_comment("test_employees")).to eq(table_comment)
-      expect(TestEmployee.table_comment).to eq(table_comment)
     end
 
     it "should create table with columns comment" do
-      column_comments = {:first_name => "Given Name", :last_name => "Surname"}
+      column_comments = { first_name: "Given Name", last_name: "Surname" }
       create_test_employees_table(nil, column_comments)
       class ::TestEmployee < ActiveRecord::Base; end
 
       [:first_name, :last_name].each do |attr|
         expect(@conn.column_comment("test_employees", attr.to_s)).to eq(column_comments[attr])
       end
-# may drop support this syntax
-#      [:first_name, :last_name].each do |attr|
-#        expect(TestEmployee.columns_hash[attr.to_s].comment).to eq(column_comments[attr])
-#      end
+      [:first_name, :last_name].each do |attr|
+        expect(TestEmployee.columns_hash[attr.to_s].comment).to eq(column_comments[attr])
+      end
     end
 
     it "should create table with table and columns comment and custom table name prefix" do
       ActiveRecord::Base.table_name_prefix = "xxx_"
       table_comment = "Test Employees"
-      column_comments = {:first_name => "Given Name", :last_name => "Surname"}
+      column_comments = { first_name: "Given Name", last_name: "Surname" }
       create_test_employees_table(table_comment, column_comments)
       class ::TestEmployee < ActiveRecord::Base; end
 
       expect(@conn.table_comment(TestEmployee.table_name)).to eq(table_comment)
-      expect(TestEmployee.table_comment).to eq(table_comment)
       [:first_name, :last_name].each do |attr|
         expect(@conn.column_comment(TestEmployee.table_name, attr.to_s)).to eq(column_comments[attr])
       end
-# may drop support this syntax
-#      [:first_name, :last_name].each do |attr|
-#        expect(TestEmployee.columns_hash[attr.to_s].comment).to eq(column_comments[attr])
-#      end
+      [:first_name, :last_name].each do |attr|
+        expect(TestEmployee.columns_hash[attr.to_s].comment).to eq(column_comments[attr])
+      end
     end
 
   end
@@ -402,21 +396,21 @@ describe "OracleEnhancedAdapter schema definition" do
   describe "rename tables and sequences" do
     before(:each) do
       @conn = ActiveRecord::Base.connection
-        schema_define do
-          drop_table :test_employees rescue nil
-          drop_table :new_test_employees rescue nil
-          drop_table :test_employees_no_primary_key rescue nil
+      schema_define do
+        drop_table :test_employees rescue nil
+        drop_table :new_test_employees rescue nil
+        drop_table :test_employees_no_primary_key rescue nil
 
-          create_table  :test_employees do |t|
-            t.string    :first_name
-            t.string    :last_name
-          end
+        create_table  :test_employees do |t|
+          t.string    :first_name
+          t.string    :last_name
+        end
 
-          create_table  :test_employees_no_pkey, :id => false do |t|
-            t.string    :first_name
-            t.string    :last_name
-          end
+        create_table  :test_employees_no_pkey, id: false do |t|
+          t.string    :first_name
+          t.string    :last_name
         end
+      end
     end
 
     after(:each) do
@@ -431,25 +425,25 @@ describe "OracleEnhancedAdapter schema definition" do
 
     it "should rename table name with new one" do
       expect do
-        @conn.rename_table("test_employees","new_test_employees")
+        @conn.rename_table("test_employees", "new_test_employees")
       end.not_to raise_error
     end
 
     it "should raise error when new table name length is too long" do
       expect do
-        @conn.rename_table("test_employees","a"*31)
+        @conn.rename_table("test_employees", "a" * 31)
       end.to raise_error(ArgumentError)
     end
 
     it "should not raise error when new sequence name length is too long" do
       expect do
-        @conn.rename_table("test_employees","a"*27)
+        @conn.rename_table("test_employees", "a" * 27)
       end.not_to raise_error
     end
 
     it "should rename table when table has no primary key and sequence" do
       expect do
-        @conn.rename_table("test_employees_no_pkey","new_test_employees_no_pkey")
+        @conn.rename_table("test_employees_no_pkey", "new_test_employees_no_pkey")
       end.not_to raise_error
     end
 
@@ -473,7 +467,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!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should create table trigger with :new reference" do
@@ -499,69 +493,69 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     it "should return default index name if it is not larger than 30 characters" do
-      expect(@conn.index_name("employees", :column => "first_name")).to eq("index_employees_on_first_name")
+      expect(@conn.index_name("employees", column: "first_name")).to eq("index_employees_on_first_name")
     end
 
     it "should return shortened index name by removing 'index', 'on' and 'and' keywords" do
-      expect(@conn.index_name("employees", :column => ["first_name", "email"])).to eq("i_employees_first_name_email")
+      expect(@conn.index_name("employees", column: ["first_name", "email"])).to eq("i_employees_first_name_email")
     end
 
     it "should return shortened index name by shortening table and column names" do
-      expect(@conn.index_name("employees", :column => ["first_name", "last_name"])).to eq("i_emp_fir_nam_las_nam")
+      expect(@conn.index_name("employees", column: ["first_name", "last_name"])).to eq("i_emp_fir_nam_las_nam")
     end
 
     it "should raise error if too large index name cannot be shortened" do
-      expect(@conn.index_name("test_employees", :column => ["first_name", "middle_name", "last_name"])).to eq(
-        'i'+Digest::SHA1.hexdigest("index_test_employees_on_first_name_and_middle_name_and_last_name")[0,29]
+      expect(@conn.index_name("test_employees", column: ["first_name", "middle_name", "last_name"])).to eq(
+        "i" + Digest::SHA1.hexdigest("index_test_employees_on_first_name_and_middle_name_and_last_name")[0, 29]
       )
     end
 
   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
+  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
-      class ::TestEmployee < ActiveRecord::Base; 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!")
+  after(:each) do
+    schema_define do
+      drop_table :test_employees
     end
+    Object.send(:remove_const, "TestEmployee")
+    ActiveRecord::Base.clear_cache!
+  end
 
-    it "should raise error when current index name and new index name are identical" do
-      expect do
-        @conn.rename_index("test_employees","i_test_employees_first_name","i_test_employees_first_name")
-      end.to raise_error(ActiveRecord::StatementInvalid)
-    end
+  it "should raise error when current index name and new index name are identical" do
+    expect do
+      @conn.rename_index("test_employees", "i_test_employees_first_name", "i_test_employees_first_name")
+    end.to raise_error(ActiveRecord::StatementInvalid)
+  end
 
-    it "should raise error when new index name length is too long" do
-      expect do
-        @conn.rename_index("test_employees","i_test_employees_first_name","a"*31)
-      end.to raise_error(ArgumentError)
-    end
+  it "should raise error when new index name length is too long" do
+    expect do
+      @conn.rename_index("test_employees", "i_test_employees_first_name", "a" * 31)
+    end.to raise_error(ArgumentError)
+  end
 
-    it "should raise error when current index name does not exist" do
-      expect do
-        @conn.rename_index("test_employees","nonexist_index_name","new_index_name")
-      end.to raise_error(ArgumentError)
-    end
+  it "should raise error when current index name does not exist" do
+    expect do
+      @conn.rename_index("test_employees", "nonexist_index_name", "new_index_name")
+    end.to raise_error(ActiveRecord::StatementInvalid)
+  end
 
-    it "should rename index name with new one" do
-      expect do
-        @conn.rename_index("test_employees","i_test_employees_first_name","new_index_name")
-      end.not_to raise_error
-    end
+  it "should rename index name with new one" do
+    expect do
+      @conn.rename_index("test_employees", "i_test_employees_first_name", "new_index_name")
+    end.not_to raise_error
+  end
 end
 
   describe "ignore options for LOB columns" do
@@ -574,8 +568,8 @@ end
     it "should ignore :limit option for :text column" do
       expect do
         schema_define do
-          create_table :test_posts, :force => true do |t|
-            t.text :body, :limit => 10000
+          create_table :test_posts, force: true do |t|
+            t.text :body, limit: 10000
           end
         end
       end.not_to raise_error
@@ -584,8 +578,8 @@ end
     it "should ignore :limit option for :binary column" do
       expect do
         schema_define do
-          create_table :test_posts, :force => true do |t|
-            t.binary :picture, :limit => 10000
+          create_table :test_posts, force: true do |t|
+            t.binary :picture, limit: 10000
           end
         end
       end.not_to raise_error
@@ -594,18 +588,18 @@ end
   end
 
   describe "foreign key constraints" do
-    let(:table_name_prefix) { '' }
-    let(:table_name_suffix) { '' }
+    let(:table_name_prefix) { "" }
+    let(:table_name_suffix) { "" }
 
     before(:each) do
       ActiveRecord::Base.table_name_prefix = table_name_prefix
       ActiveRecord::Base.table_name_suffix = table_name_suffix
       schema_define do
-        create_table :test_posts, :force => true do |t|
+        create_table :test_posts, force: true do |t|
           t.string :title
         end
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
           t.references :test_post
           t.integer :post_id
         end
@@ -625,9 +619,9 @@ end
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
-      ActiveRecord::Base.table_name_prefix = ''
-      ActiveRecord::Base.table_name_suffix = ''
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.table_name_suffix = ""
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should add foreign key" do
@@ -637,98 +631,46 @@ end
         add_foreign_key :test_comments, :test_posts
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/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
-
-        expect do
-          TestComment.create(:body => "test", :test_post_id => 1)
-        end.to raise_error() {|e| expect(e.message).to match(/ORA-02291.*\.#{fk_name}/i)}
-      end
-    end
-
-    context "with table_name_suffix" do
-      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
-
-        expect do
-          TestComment.create(:body => "test", :test_post_id => 1)
-        end.to raise_error() {|e| expect(e.message).to match(/ORA-02291.*\.#{fk_name}/i)}
-      end
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291.*\.#{fk_name}/i) }
     end
 
     it "should add foreign key with name" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :name => "comments_posts_fk"
-      end
-      expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291.*\.COMMENTS_POSTS_FK/)}
-    end
-
-    it "should add foreign key with long name which is shortened" do
-      schema_define do
-        add_foreign_key :test_comments, :test_posts, :name => "test_comments_test_post_id_foreign_key"
+        add_foreign_key :test_comments, :test_posts, name: "comments_posts_fk"
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(
-        /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
-      schema_define do
-        add_foreign_key :test_comments, :test_posts, :name => "long_prefix_test_comments_test_post_id_foreign_key"
-      end
-      expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(
-        /ORA-02291.*\.C#{Digest::SHA1.hexdigest("long_prefix_test_comments_test_post_id_foreign_key")[0,29].upcase}/
-      )}
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291.*\.COMMENTS_POSTS_FK/) }
     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"
+        add_foreign_key :test_comments, :test_posts, column: "post_id"
       end
       expect do
-        TestComment.create(:body => "test", :post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291.*\.#{fk_name}/i)}
+        TestComment.create(body: "test", post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291.*\.#{fk_name}/i) }
     end
 
     it "should add foreign key with delete dependency" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :dependent => :delete
+        add_foreign_key :test_comments, :test_posts, on_delete: :cascade
       end
-      p = TestPost.create(:title => "test")
-      c = TestComment.create(:body => "test", :test_post => p)
+      p = TestPost.create(title: "test")
+      c = TestComment.create(body: "test", test_post: p)
       TestPost.delete(p.id)
       expect(TestComment.find_by_id(c.id)).to be_nil
     end
 
     it "should add foreign key with nullify dependency" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :dependent => :nullify
+        add_foreign_key :test_comments, :test_posts, on_delete: :nullify
       end
-      p = TestPost.create(:title => "test")
-      c = TestComment.create(:body => "test", :test_post => p)
+      p = TestPost.create(title: "test")
+      c = TestComment.create(body: "test", test_post: p)
       TestPost.delete(p.id)
       expect(TestComment.find_by_id(c.id).test_post_id).to be_nil
     end
@@ -739,27 +681,27 @@ end
         remove_foreign_key :test_comments, :test_posts
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
+        TestComment.create(body: "test", test_post_id: 1)
       end.not_to raise_error
     end
 
     it "should remove foreign key by constraint name" do
       schema_define do
-        add_foreign_key :test_comments, :test_posts, :name => "comments_posts_fk"
-        remove_foreign_key :test_comments, :name => "comments_posts_fk"
+        add_foreign_key :test_comments, :test_posts, name: "comments_posts_fk"
+        remove_foreign_key :test_comments, name: "comments_posts_fk"
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
+        TestComment.create(body: "test", test_post_id: 1)
       end.not_to raise_error
     end
 
     it "should remove foreign key by column name" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
-        remove_foreign_key :test_comments, :column => "test_post_id"
+        remove_foreign_key :test_comments, column: "test_post_id"
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
+        TestComment.create(body: "test", test_post_id: 1)
       end.not_to raise_error
     end
 
@@ -770,11 +712,11 @@ end
       class ::TestPost < ActiveRecord::Base
       end
     end
-    it 'should use default tablespace for clobs' do
+    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|
+        create_table :test_posts, force: true do |t|
           t.text :test_clob
           t.binary :test_blob
         end
@@ -783,11 +725,11 @@ end
       expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_lobs WHERE table_name='TEST_POSTS' and column_name = 'TEST_BLOB'")).not_to eq(DATABASE_NON_DEFAULT_TABLESPACE)
     end
 
-    it 'should use default tablespace for blobs' do
+    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|
+        create_table :test_posts, force: true do |t|
           t.text :test_clob
           t.binary :test_blob
         end
@@ -812,10 +754,10 @@ end
       end
     end
 
-    it 'should use default tablespace for primary key' do
+    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
+        create_table :test_posts, force: true
       end
 
       index_name = @conn.select_value(
@@ -824,13 +766,13 @@ end
             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')
+      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
+    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
+        create_table :test_posts, force: true
       end
 
       index_name = @conn.select_value(
@@ -854,7 +796,7 @@ end
   describe "foreign key in table definition" do
     before(:each) do
       schema_define do
-        create_table :test_posts, :force => true do |t|
+        create_table :test_posts, force: true do |t|
           t.string :title
         end
       end
@@ -873,38 +815,38 @@ end
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should add foreign key in create_table" do
       schema_define do
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
           t.references :test_post
           t.foreign_key :test_posts
         end
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291/)}
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291/) }
     end
 
     it "should add foreign key in create_table references" do
       schema_define do
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
-          t.references :test_post, :foreign_key => true
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
+          t.references :test_post, foreign_key: true
         end
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291/)}
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291/) }
     end
 
     it "should add foreign key in change_table" do
       schema_define do
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
           t.references :test_post
         end
         change_table :test_comments do |t|
@@ -912,40 +854,22 @@ end
         end
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291/)}
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291/) }
     end
 
     it "should add foreign key in change_table references" do
       schema_define do
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
-        end
-        change_table :test_comments do |t|
-          t.references :test_post, :foreign_key => true
-        end
-      end
-      expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291/)}
-    end
-
-    it "should remove foreign key by table name" do
-      schema_define do
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
-          t.references :test_post
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
         end
         change_table :test_comments do |t|
-          t.foreign_key :test_posts
-        end
-        change_table :test_comments do |t|
-          t.remove_foreign_key :test_posts
+          t.references :test_post, foreign_key: true
         end
       end
       expect do
-        TestComment.create(:body => "test", :test_post_id => 1)
-      end.not_to raise_error
+        TestComment.create(body: "test", test_post_id: 1)
+      end.to raise_error() { |e| expect(e.message).to match(/ORA-02291/) }
     end
 
   end
@@ -957,16 +881,16 @@ end
 
     before(:each) do
       schema_define do
-        create_table :test_posts, :force => true do |t|
+        create_table :test_posts, force: true do |t|
           t.string :title
         end
-        create_table :test_comments, :force => true do |t|
-          t.string :body, :limit => 4000
-          t.references :test_post, :foreign_key => true
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
+          t.references :test_post, foreign_key: true
         end
-        create_table "test_Mixed_Comments", :force => true do |t|
-          t.string :body, :limit => 4000
-          t.references :test_post, :foreign_key => true
+        create_table "test_Mixed_Comments", force: true do |t|
+          t.string :body, limit: 4000
+          t.references :test_post, foreign_key: true
         end
       end
     end
@@ -1007,7 +931,7 @@ end
       @conn.execute "DROP DATABASE LINK #{@db_link}" rescue nil
       @conn.execute "CREATE DATABASE LINK #{@db_link} CONNECT TO #{@db_link_username} IDENTIFIED BY \"#{@db_link_password}\" USING '#{@db_link_database}'"
       schema_define do
-        create_table :test_posts, :force => true do |t|
+        create_table :test_posts, force: true do |t|
           t.string :title
         end
       end
@@ -1032,28 +956,28 @@ end
         remove_synonym :synonym_to_posts
         remove_synonym :synonym_to_posts_seq
       end
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should create synonym to table and sequence" do
       schema_name = @username
       schema_define do
-        add_synonym :synonym_to_posts, "#{schema_name}.test_posts", :force => true
-        add_synonym :synonym_to_posts_seq, "#{schema_name}.test_posts_seq", :force => true
+        add_synonym :synonym_to_posts, "#{schema_name}.test_posts", force: true
+        add_synonym :synonym_to_posts_seq, "#{schema_name}.test_posts_seq", force: true
       end
       expect do
-        TestPost.create(:title => "test")
+        TestPost.create(title: "test")
       end.not_to raise_error
     end
 
     it "should create synonym to table over database link" do
       db_link = @db_link
       schema_define do
-        add_synonym :synonym_to_posts, "test_posts@#{db_link}", :force => true
-        add_synonym :synonym_to_posts_seq, "test_posts_seq@#{db_link}", :force => true
+        add_synonym :synonym_to_posts, "test_posts@#{db_link}", force: true
+        add_synonym :synonym_to_posts_seq, "test_posts_seq@#{db_link}", force: true
       end
       expect do
-        TestPost.create(:title => "test")
+        TestPost.create(title: "test")
       end.not_to raise_error
     end
 
@@ -1076,27 +1000,27 @@ end
 
     before(:each) do
       schema_define do
-        create_table :test_posts, :force => true do |t|
-          t.string :title, :null => false
+        create_table :test_posts, force: true do |t|
+          t.string :title, null: false
           t.string :content
         end
       end
       class ::TestPost < ActiveRecord::Base; end
-      expect(TestPost.columns_hash['title'].null).to be_falsey
+      expect(TestPost.columns_hash["title"].null).to be_falsey
     end
 
     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!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should change column to nullable" do
       schema_define do
-        change_column :test_posts, :title, :string, :null => true
+        change_column :test_posts, :title, :string, null: true
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['title'].null).to be_truthy
+      expect(TestPost.columns_hash["title"].null).to be_truthy
     end
 
     it "should add column" do
@@ -1104,7 +1028,7 @@ end
         add_column :test_posts, :body, :string
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['body']).not_to be_nil
+      expect(TestPost.columns_hash["body"]).not_to be_nil
     end
 
     it "should add lob column with non_default tablespace" do
@@ -1128,8 +1052,8 @@ end
         rename_column :test_posts, :title, :subject
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['subject']).not_to be_nil
-      expect(TestPost.columns_hash['title']).to be_nil
+      expect(TestPost.columns_hash["subject"]).not_to be_nil
+      expect(TestPost.columns_hash["title"]).to be_nil
     end
 
     it "should remove column" do
@@ -1137,7 +1061,7 @@ end
         remove_column :test_posts, :title
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['title']).to be_nil
+      expect(TestPost.columns_hash["title"]).to be_nil
     end
 
     it "should remove column when using change_table" do
@@ -1147,7 +1071,7 @@ end
         end
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['title']).to be_nil
+      expect(TestPost.columns_hash["title"]).to be_nil
     end
 
     it "should remove multiple columns when using change_table" do
@@ -1157,8 +1081,8 @@ end
         end
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['title']).to be_nil
-      expect(TestPost.columns_hash['content']).to be_nil
+      expect(TestPost.columns_hash["title"]).to be_nil
+      expect(TestPost.columns_hash["content"]).to be_nil
     end
 
     it "should ignore type and options parameter and remove column" do
@@ -1166,45 +1090,16 @@ end
         remove_column :test_posts, :title, :string, {}
       end
       TestPost.reset_column_information
-      expect(TestPost.columns_hash['title']).to be_nil
+      expect(TestPost.columns_hash["title"]).to be_nil
     end
   end
 
-  describe 'virtual columns in create_table' do
+  describe "virtual columns in create_table" do
     before(:each) do
       skip "Not supported in this database version" unless @oracle11g_or_higher
     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
-        self.table_name = "test_fractions"
-      end
-
-      TestFraction.reset_column_information
-      tf = TestFraction.columns.detect { |c| c.virtual? }
-      expect(tf).not_to be nil
-      expect(tf.name).to eq("field2")
-      expect(tf.virtual?).to be true
-      expect do
-        tf = TestFraction.new(:field1=>10)
-        expect(tf.field2).to be nil # not whatever is in DATA_DEFAULT column
-        tf.save!
-        tf.reload
-      end.not_to raise_error
-      expect(tf.field2.to_i).to eq(11)
-
-      schema_define do
-        drop_table :test_fractions
-      end
-    end
-
-    it 'should raise error if column expression is not provided' do
+    it "should raise error if column expression is not provided" do
       expect {
         schema_define do
           create_table :test_fractions do |t|
@@ -1216,15 +1111,15 @@ end
     end
   end
 
-  describe 'virtual columns' do
+  describe "virtual columns" do
     before(:each) do
       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|
-          t.integer :numerator, :default=>0
-          t.integer :denominator, :default=>0
-          t.virtual :percent, :as => expr
+        create_table :test_fractions, force: true do |t|
+          t.integer :numerator, default: 0
+          t.integer :denominator, default: 0
+          t.virtual :percent, as: expr
         end
       end
       class ::TestFraction < ActiveRecord::Base
@@ -1241,13 +1136,13 @@ end
       end
     end
 
-    it 'should include virtual columns and not try to update them' do
+    it "should include virtual columns and not try to update them" do
       tf = TestFraction.columns.detect { |c| c.virtual? }
       expect(tf).not_to be nil
       expect(tf.name).to eq("percent")
       expect(tf.virtual?).to be true
       expect do
-        tf = TestFraction.new(:numerator=>20, :denominator=>100)
+        tf = TestFraction.new(numerator: 20, denominator: 100)
         expect(tf.percent).to be nil # not whatever is in DATA_DEFAULT column
         tf.save!
         tf.reload
@@ -1255,16 +1150,16 @@ end
       expect(tf.percent.to_i).to eq(20)
     end
 
-    it 'should add virtual column' do
+    it "should add virtual column" do
       schema_define do
-        add_column :test_fractions, :rem, :virtual, :as => 'remainder(numerator, NULLIF(denominator,0))'
+        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 = TestFraction.columns.detect { |c| c.name == "rem" }
       expect(tf).not_to be nil
       expect(tf.virtual?).to be true
       expect do
-        tf = TestFraction.new(:numerator=>7, :denominator=>5)
+        tf = TestFraction.new(numerator: 7, denominator: 5)
         expect(tf.rem).to be nil
         tf.save!
         tf.reload
@@ -1272,64 +1167,64 @@ end
       expect(tf.rem.to_i).to eq(2)
     end
 
-    it 'should add virtual column with explicit type' do
+    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
+        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 = TestFraction.columns.detect { |c| c.name == "expression" }
       expect(tf).not_to be nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :string
       expect(tf.limit).to be 100
       expect do
-        tf = TestFraction.new(:numerator=>7, :denominator=>5)
+        tf = TestFraction.new(numerator: 7, denominator: 5)
         expect(tf.expression).to be nil
         tf.save!
         tf.reload
       end.not_to raise_error
-      expect(tf.expression).to eq('7/5')
+      expect(tf.expression).to eq("7/5")
     end
 
-    it 'should change virtual column definition' do
+    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
+          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 = TestFraction.columns.detect { |c| c.name == "percent" }
       expect(tf).not_to be nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :decimal
       expect(tf.precision).to be 15
       expect(tf.scale).to be 2
       expect do
-        tf = TestFraction.new(:numerator=>11, :denominator=>17)
+        tf = TestFraction.new(numerator: 11, denominator: 17)
         expect(tf.percent).to be nil
         tf.save!
         tf.reload
       end.not_to raise_error
-      expect(tf.percent).to eq('64.71'.to_d)
+      expect(tf.percent).to eq("64.71".to_d)
     end
 
-    it 'should change virtual column type' do
+    it "should change virtual column type" do
       schema_define do
-        change_column :test_fractions, :percent, :virtual, :type => :decimal, :precision => 12, :scale => 5
+        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 = TestFraction.columns.detect { |c| c.name == "percent" }
       expect(tf).not_to be nil
       expect(tf.virtual?).to be true
       expect(tf.type).to be :decimal
       expect(tf.precision).to be 12
       expect(tf.scale).to be 5
       expect do
-        tf = TestFraction.new(:numerator=>11, :denominator=>17)
+        tf = TestFraction.new(numerator: 11, denominator: 17)
         expect(tf.percent).to be nil
         tf.save!
         tf.reload
       end.not_to raise_error
-      expect(tf.percent).to eq('64.70588'.to_d)
+      expect(tf.percent).to eq("64.70588".to_d)
     end
   end
 
@@ -1339,10 +1234,9 @@ end
     end
 
     before(:each) do
-      @conn.instance_variable_set :@would_execute_sql, @would_execute_sql=''
+      @conn.instance_variable_set :@would_execute_sql, @would_execute_sql = ""
       class <<@conn
-        def execute(sql,name=nil); @would_execute_sql << sql << ";\n"; end
-        def index_name_exists?(table_name, index_name, default); default; end
+        def execute(sql, name = nil); @would_execute_sql << sql << ";\n"; end
       end
     end
 
@@ -1350,13 +1244,13 @@ end
       class <<@conn
         remove_method :execute
       end
-      @conn.instance_eval{ remove_instance_variable :@would_execute_sql }
+      @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|
-          t.string :title, :null => false
+        create_table :test_posts, options: "NOLOGGING", force: true do |t|
+          t.string :title, null: false
         end
       end
       expect(@would_execute_sql).to match(/CREATE +TABLE .* \(.*\) NOLOGGING/)
@@ -1364,8 +1258,8 @@ end
 
     it "should support the :tablespace option to create_table" do
       schema_define do
-        create_table :test_posts, :tablespace=>'bogus', :force => true do |t|
-          t.string :title, :null => false
+        create_table :test_posts, tablespace: "bogus", force: true do |t|
+          t.string :title, null: false
         end
       end
       expect(@would_execute_sql).to match(/CREATE +TABLE .* \(.*\) TABLESPACE bogus/)
@@ -1391,7 +1285,7 @@ end
         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|
+        @conn.create_table :tablespace_tests, id: false, organization: "INDEX INITRANS 4 COMPRESS 1", tablespace: "bogus" do |t|
           t.integer :id
         end
         expect(@would_execute_sql).to match(/CREATE +TABLE .*\(.*\)\s+ORGANIZATION INDEX INITRANS 4 COMPRESS 1 TABLESPACE bogus/)
@@ -1400,14 +1294,14 @@ end
 
     it "should support the :options option to add_index" do
       schema_define do
-        add_index :keyboards, :name, :options=>'NOLOGGING'
+        add_index :keyboards, :name, options: "NOLOGGING"
       end
       expect(@would_execute_sql).to match(/CREATE +INDEX .* ON .* \(.*\) NOLOGGING/)
     end
 
     it "should support the :tablespace option to add_index" do
       schema_define do
-        add_index :keyboards, :name, :tablespace=>'bogus'
+        add_index :keyboards, :name, tablespace: "bogus"
       end
       expect(@would_execute_sql).to match(/CREATE +INDEX .* ON .* \(.*\) TABLESPACE bogus/)
     end
@@ -1423,7 +1317,7 @@ 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
+        add_index :keyboards, "lower(name)", unique: true, name: :index_keyboards_on_lower_name
       end
       expect(@would_execute_sql).not_to match(/ALTER +TABLE .* ADD CONSTRAINT .* UNIQUE \(.*\(.*\)\)/)
     end