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

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb

@@ -103,9 +103,11 @@ module ActiveRecord
           references = options[:references] ? options[:references].first : nil
           references_sql = quote_column_name(options[:primary_key] || references || "id")
         end
-        
-        sql = "FOREIGN KEY (#{columns_sql}) REFERENCES #{quote_table_name(to_table)}(#{references_sql})"
-        
+
+        table_name = ActiveRecord::Migrator.proper_table_name(to_table)
+
+        sql = "FOREIGN KEY (#{columns_sql}) REFERENCES #{quote_table_name(table_name)}(#{references_sql})"
+
         case options[:dependent]
         when :nullify
           sql << " ON DELETE SET NULL"

data/lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb

@@ -136,7 +136,7 @@ module ActiveRecord #:nodoc:
 
       def dump_schema_information #:nodoc:
         sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-        migrated = select_values("SELECT version FROM #{sm_table}")
+        migrated = select_values("SELECT version FROM #{sm_table} ORDER BY version")
         join_with_statement_token(migrated.map{|v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}')" })
       end
 
@@ -149,23 +149,23 @@ module ActiveRecord #:nodoc:
                       AND name NOT LIKE 'BIN$%'
                       AND owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY type").each do |source|
           ddl = "CREATE OR REPLACE   \n"
-          lines = select_all(%Q{
+          select_all(%Q{
                   SELECT text
                     FROM all_source
                    WHERE name = '#{source['name']}'
                      AND type = '#{source['type']}'
                      AND owner = SYS_CONTEXT('userenv', 'current_schema')
                    ORDER BY line
-                }).map do |row|
+                }).each do |row|
             ddl << row['text']
           end
-          ddl << ";" unless ddl.strip[-1,1] == ";"
+          ddl << ";" unless ddl.strip[-1,1] == ';'
           structure << ddl
         end
 
         # export views 
-        select_all("SELECT view_name, text FROM user_views").each do |view|
-          structure << "CREATE OR REPLACE VIEW #{view['view_name']} AS\n #{view['text']}"
+        select_all("SELECT view_name, text FROM user_views ORDER BY view_name ASC").each do |view|
+          structure << "CREATE OR REPLACE FORCE VIEW #{view['view_name']} AS\n #{view['text']}"
         end
 
         # export synonyms
@@ -240,7 +240,7 @@ module ActiveRecord #:nodoc:
 
       def execute_structure_dump(string)
         string.split(STATEMENT_TOKEN).each do |ddl|
-          ddl.chop! if ddl.last == ";"
+          ddl.chop! if ddl[-1,1] == ';'
           execute(ddl) unless ddl.blank?
         end
       end

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -1 +1 @@
-ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION = File.read(File.dirname(__FILE__)+'/../../../VERSION').chomp
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION = File.read(File.expand_path('../../../../VERSION', __FILE__)).chomp

data/lib/pmacs-activerecord-oracle_enhanced-adapter.rb

@@ -5,7 +5,7 @@ if defined?(::Rails::Railtie)
     module ConnectionAdapters
       class OracleEnhancedRailtie < ::Rails::Railtie
         rake_tasks do
-          load 'active_record/connection_adapters/oracle_enhanced.rake'
+          load 'active_record/connection_adapters/oracle_enhanced_database_tasks.rb'
         end
 
         ActiveSupport.on_load(:active_record) do
@@ -22,4 +22,4 @@ if defined?(::Rails::Railtie)
     end
   end
 
-end
+end

data/pmacs-activerecord-oracle_enhanced-adapter.gemspec

@@ -4,14 +4,18 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "pmacs-activerecord-oracle_enhanced-adapter"
-  s.version = "1.4.2.rc1"
+  s.name = %q{pmacs-activerecord-oracle_enhanced-adapter}
+  s.version = "1.5.1.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Charles Treatman", "Raimonds Simanovskis"]
-  s.date = "2013-02-22"
-  s.description = "Oracle \"enhanced\" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.\nThis adapter is superset of original ActiveRecord Oracle adapter.\n"
-  s.email = "charles.treatman@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Charles Treatman}, %q{Raimonds Simanovskis}]
+  s.date = %q{2013-03-18}
+  s.version = "1.5.5.1"
+
+  s.description = %q{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.
+}
+  s.email = %q{charles.treatman@gmail.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -25,33 +29,31 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/active_record/connection_adapters/emulation/oracle_adapter.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced.rake",
-    "lib/active_record/connection_adapters/oracle_enhanced_activerecord_patches.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_column.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_column_dumper.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_connection.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_context_index.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_cpk.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_database_tasks.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_procedures.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_schema_creation.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
     "lib/pmacs-activerecord-oracle_enhanced-adapter.rb",
     "pmacs-activerecord-oracle_enhanced-adapter.gemspec",
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",
@@ -70,8 +72,8 @@ Gem::Specification.new do |s|
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",
@@ -87,7 +89,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
@@ -100,7 +102,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-plsql>, [">= 0.4.4"])
       s.add_development_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     else
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_dependency(%q<rspec>, ["~> 2.4"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
@@ -114,7 +116,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     end
   else
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
     s.add_dependency(%q<rspec>, ["~> 2.4"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -41,76 +41,6 @@ describe "OracleEnhancedAdapter" do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
   end
   
-  describe "database session store" do
-    before(:all) do
-      @conn.execute "DROP TABLE sessions" rescue nil
-      @conn.execute "DROP SEQUENCE sessions_seq" rescue nil
-      @conn = ActiveRecord::Base.connection
-      @conn.execute <<-SQL
-        CREATE TABLE sessions (
-          id          NUMBER(38,0) NOT NULL,
-          session_id  VARCHAR2(255) DEFAULT NULL,
-          data        CLOB DEFAULT NULL,
-          created_at  DATE DEFAULT NULL,
-          updated_at  DATE DEFAULT NULL,
-          PRIMARY KEY (ID)
-        )
-      SQL
-      @conn.execute <<-SQL
-        CREATE SEQUENCE sessions_seq  MINVALUE 1 MAXVALUE 999999999999999999999999999
-          INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
-      SQL
-      if ENV['RAILS_GEM_VERSION'] >= '2.3'
-        @session_class = ActiveRecord::SessionStore::Session
-      else
-        @session_class = CGI::Session::ActiveRecordStore::Session
-      end
-    end
-
-    after(:all) do
-      @conn.execute "DROP TABLE sessions"
-      @conn.execute "DROP SEQUENCE sessions_seq"
-    end
-
-    it "should create sessions table" do
-      ActiveRecord::Base.connection.tables.grep("sessions").should_not be_empty
-    end
-
-    it "should save session data" do
-      @session = @session_class.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
-      @session.save!
-      @session = @session_class.find_by_session_id("111111")
-      @session.data.should == "something"
-    end
-
-    it "should change session data when partial updates enabled" do
-      return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:partial_updates=)
-      @session_class.partial_updates = true
-      @session = @session_class.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
-      @session.save!
-      @session = @session_class.find_by_session_id("222222")
-      @session.data = "other thing"
-      @session.save!
-      # second save should call again blob writing callback
-      @session.save!
-      @session = @session_class.find_by_session_id("222222")
-      @session.data.should == "other thing"
-    end
-
-    it "should have one enhanced_write_lobs callback" do
-      return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:after_save_callback_chain)
-      @session_class.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
-    end
-
-    it "should not set sessions table session_id column type as integer if emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('sessions')
-      column = columns.detect{|c| c.name == "session_id"}
-      column.type.should == :string
-    end
-
-  end
-
   describe "ignore specified table columns" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -186,13 +116,14 @@ describe "OracleEnhancedAdapter" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
       @conn.execute "DROP TABLE test_employees" rescue nil
-      @oracle11g = !! @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+      @oracle11g_or_higher = !! @conn.select_value(
+        "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
           id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
-          #{ @oracle11g ? "full_name AS (first_name || ' ' || last_name)," : "full_name VARCHAR2(46),"}
+          #{ @oracle11g_or_higher ? "full_name AS (first_name || ' ' || last_name)," : "full_name VARCHAR2(46),"}
           hire_date     DATE
         )
       SQL
@@ -209,11 +140,7 @@ describe "OracleEnhancedAdapter" do
       end
       # Another class using the same table
       class ::TestEmployee2 < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "test_employees"
-        else
-          set_table_name "test_employees"
-        end
+        self.table_name = "test_employees"
       end
     end
 
@@ -244,7 +171,7 @@ describe "OracleEnhancedAdapter" do
       end
 
       it 'should identify virtual columns as such' do
-        pending "Not supported in this database version" unless @oracle11g
+        pending "Not supported in this database version" unless @oracle11g_or_higher
         te = TestEmployee.connection.columns('test_employees').detect(&:virtual?)
         te.name.should == 'full_name'
       end
@@ -336,11 +263,7 @@ describe "OracleEnhancedAdapter" do
       SQL
       Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
       class ::TestEmployee < ActiveRecord::Base
-        if self.respond_to?(:primary_key=)
-          self.primary_key = :employee_id
-        else
-          set_primary_key :employee_id
-        end
+        self.primary_key = :employee_id
       end
     end
 
@@ -517,11 +440,7 @@ describe "OracleEnhancedAdapter" do
     it "should allow creation of a table with non alphanumeric characters" do
       create_warehouse_things_table
       class ::WarehouseThing < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "warehouse-things"
-        else
-          set_table_name "warehouse-things"
-        end
+        self.table_name = "warehouse-things"
       end
 
       wh = WarehouseThing.create!(:name => "Foo", :foo => 2)
@@ -533,11 +452,7 @@ describe "OracleEnhancedAdapter" do
     it "should allow creation of a table with CamelCase name" do
       create_camel_case_table
       class ::CamelCase < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "CamelCase"
-        else
-          set_table_name "CamelCase"
-        end
+        self.table_name = "CamelCase"
       end
 
       cc = CamelCase.create!(:name => "Foo", :foo => 2)
@@ -569,11 +484,7 @@ describe "OracleEnhancedAdapter" do
       @conn.execute "CREATE OR REPLACE SYNONYM test_posts_seq FOR test_posts_seq@#{@db_link}"
       class ::TestPost < ActiveRecord::Base
       end
-      if TestPost.respond_to?(:table_name=)
-        TestPost.table_name = "test_posts"
-      else
-        TestPost.set_table_name "test_posts"
-      end
+      TestPost.table_name = "test_posts"
     end
 
     after(:all) do
@@ -682,7 +593,7 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should load included association with more than 1000 records" do
-      posts = TestPost.includes(:test_comments).all
+      posts = TestPost.includes(:test_comments).to_a
       posts.size.should == @ids.size
     end
 
@@ -775,4 +686,29 @@ describe "OracleEnhancedAdapter" do
       explain.should include("INDEX UNIQUE SCAN")
     end
   end if ENV['RAILS_GEM_VERSION'] >= '3.2'
+
+  describe ".is_integer_column?" do
+    before(:all) do
+      @adapter = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
+    end
+
+    it "should return TrueClass or FalseClass" do
+      @adapter.is_integer_column?("adapter_id").should be_a TrueClass
+      @adapter.is_integer_column?("").should be_a FalseClass
+    end
+
+    it "should return true if name is 'id'" do
+      @adapter.is_integer_column?("id").should be_true
+    end
+
+    it "should return true if name ends with '_id'" do
+      @adapter.is_integer_column?("_id").should be_true
+      @adapter.is_integer_column?("foo_id").should be_true
+    end
+
+    it "should return false if name is 'something_else'" do
+      @adapter.is_integer_column?("something_else").should be_false
+    end
+  end
+
 end

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -92,7 +92,8 @@ describe "OracleEnhancedConnection" do
 
       it "should create new connection using :url" do
         params = CONNECTION_PARAMS.dup
-        params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "#{DATABASE_HOST}:"}#{DATABASE_PORT && "#{DATABASE_PORT}:"}#{DATABASE_NAME}"
+        params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "//#{DATABASE_HOST}#{DATABASE_PORT && ":#{DATABASE_PORT}"}/"}#{DATABASE_NAME}"
+
         params[:host] = nil
         params[:database] = nil
         @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(params)
@@ -157,7 +158,7 @@ describe "OracleEnhancedConnection" do
 
     it "should fall back to directly instantiating OracleDriver" do
       params = CONNECTION_PARAMS.dup
-      params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "#{DATABASE_HOST}:"}#{DATABASE_PORT && "#{DATABASE_PORT}:"}#{DATABASE_NAME}"
+      params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "//#{DATABASE_HOST}#{DATABASE_PORT && ":#{DATABASE_PORT}"}/"}#{DATABASE_NAME}"
       params[:host] = nil
       params[:database] = nil
       java.sql.DriverManager.stub!(:getConnection).and_raise('no suitable driver found')
@@ -226,7 +227,9 @@ describe "OracleEnhancedConnection" do
 
     it "should execute prepared statement with decimal bind parameter " do
       cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
-      cursor.bind_param(1, "1.5", :decimal)
+      column = ActiveRecord::ConnectionAdapters::OracleEnhancedColumn.new('age', nil, 'NUMBER(10,2)')
+      column.type.should == :decimal
+      cursor.bind_param(1, "1.5", column)
       cursor.exec
       cursor.close
       cursor = @conn.prepare("SELECT age FROM test_employees")
@@ -327,6 +330,17 @@ describe "OracleEnhancedConnection" do
       @conn.describe("all_tables").should == ["SYS", "ALL_TABLES"]
     end
 
+    if defined?(OCI8)
+      context "OCI8 adapter" do
+
+        it "should not fallback to SELECT-based logic when querying non-existant table information" do
+          @conn.should_not_receive(:select_one)
+          @conn.describe("non_existant") rescue ActiveRecord::ConnectionAdapters::OracleEnhancedConnectionException
+        end
+
+      end
+    end
+
   end
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -7,19 +7,19 @@ describe "OracleEnhancedAdapter context index" do
 
   def create_table_posts
     schema_define do
-      create_table :posts, :force => true do |t|
+      create_table :posts, force: true do |t|
         t.string :title
         t.text :body
         t.integer :comments_count
         t.timestamps
-        t.string :all_text, :limit => 2 # will be used for multi-column index
+        t.string :all_text, limit: 2 # will be used for multi-column index
       end
     end
   end
 
   def create_table_comments
     schema_define do
-      create_table :comments, :force => true do |t|
+      create_table :comments, force: true do |t|
         t.integer :post_id
         t.string :author
         t.text :body
@@ -68,11 +68,11 @@ describe "OracleEnhancedAdapter context index" do
       class ::Post < ActiveRecord::Base
         has_context_index
       end
-      @post0 = Post.create(:title => "dummy title", :body => "dummy body")
-      @post1 = Post.create(:title => @title_words.join(' '), :body => @body_words.join(' '))
-      @post2 = Post.create(:title => (@title_words*2).join(' '), :body => (@body_words*2).join(' '))
-      @post_with_null_body = Post.create(:title => "withnull", :body => nil)
-      @post_with_null_title = Post.create(:title => nil, :body => "withnull")
+      @post0 = Post.create(title: "dummy title", body: "dummy body")
+      @post1 = Post.create(title: @title_words.join(' '), body: @body_words.join(' '))
+      @post2 = Post.create(title: (@title_words*2).join(' '), body: (@body_words*2).join(' '))
+      @post_with_null_body = Post.create(title: "withnull", body: nil)
+      @post_with_null_title = Post.create(title: nil, body: "withnull")
     end
 
     after(:all) do
@@ -88,7 +88,7 @@ describe "OracleEnhancedAdapter context index" do
     it "should create single VARCHAR2 column index" do
       @conn.add_context_index :posts, :title
       @title_words.each do |word|
-        Post.contains(:title, word).all.should == [@post2, @post1]
+        Post.contains(:title, word).to_a.should == [@post2, @post1]
       end
       @conn.remove_context_index :posts, :title
     end
@@ -96,7 +96,7 @@ describe "OracleEnhancedAdapter context index" do
     it "should create single CLOB column index" do
       @conn.add_context_index :posts, :body
       @body_words.each do |word|
-        Post.contains(:body, word).all.should == [@post2, @post1]
+        Post.contains(:body, word).to_a.should == [@post2, @post1]
       end
       @conn.remove_context_index :posts, :body
     end
@@ -110,62 +110,62 @@ describe "OracleEnhancedAdapter context index" do
     it "should create multiple column index" do
       @conn.add_context_index :posts, [:title, :body]
       (@title_words+@body_words).each do |word|
-        Post.contains(:title, word).all.should == [@post2, @post1]
+        Post.contains(:title, word).to_a.should == [@post2, @post1]
       end
       @conn.remove_context_index :posts, [:title, :body]
     end
 
     it "should index records with null values" do
       @conn.add_context_index :posts, [:title, :body]
-      Post.contains(:title, "withnull").all.should == [@post_with_null_body, @post_with_null_title]
+      Post.contains(:title, "withnull").to_a.should == [@post_with_null_body, @post_with_null_title]
       @conn.remove_context_index :posts, [:title, :body]
     end
 
     it "should create multiple column index with specified main index column" do
       @conn.add_context_index :posts, [:title, :body],
-        :index_column => :all_text, :sync => 'ON COMMIT'
-      @post = Post.create(:title => "abc", :body => "def")
-      Post.contains(:all_text, "abc").all.should == [@post]
-      Post.contains(:all_text, "def").all.should == [@post]
-      @post.update_attributes!(:title => "ghi")
+        index_column: :all_text, sync: 'ON COMMIT'
+      @post = Post.create(title: "abc", body: "def")
+      Post.contains(:all_text, "abc").to_a.should == [@post]
+      Post.contains(:all_text, "def").to_a.should == [@post]
+      @post.update_attributes!(title: "ghi")
       # index will not be updated as all_text column is not changed
-      Post.contains(:all_text, "ghi").all.should be_empty
-      @post.update_attributes!(:all_text => "1")
+      Post.contains(:all_text, "ghi").to_a.should be_empty
+      @post.update_attributes!(all_text: "1")
       # index will be updated when all_text column is changed
-      Post.contains(:all_text, "ghi").all.should == [@post]
-      @conn.remove_context_index :posts, :index_column => :all_text
+      Post.contains(:all_text, "ghi").to_a.should == [@post]
+      @conn.remove_context_index :posts, index_column: :all_text
     end
 
     it "should create multiple column index with trigger updated main index column" do
       @conn.add_context_index :posts, [:title, :body],
-        :index_column => :all_text, :index_column_trigger_on => [:created_at, :updated_at],
-        :sync => 'ON COMMIT'
-      @post = Post.create(:title => "abc", :body => "def")
-      Post.contains(:all_text, "abc").all.should == [@post]
-      Post.contains(:all_text, "def").all.should == [@post]
-      @post.update_attributes!(:title => "ghi")
+        index_column: :all_text, index_column_trigger_on: [:created_at, :updated_at],
+        sync: 'ON COMMIT'
+      @post = Post.create(title: "abc", body: "def")
+      Post.contains(:all_text, "abc").to_a.should == [@post]
+      Post.contains(:all_text, "def").to_a.should == [@post]
+      @post.update_attributes!(title: "ghi")
       # index should be updated as created_at column is changed
-      Post.contains(:all_text, "ghi").all.should == [@post]
-      @conn.remove_context_index :posts, :index_column => :all_text
+      Post.contains(:all_text, "ghi").to_a.should == [@post]
+      @conn.remove_context_index :posts, index_column: :all_text
     end
 
     it "should use base letter conversion with BASIC_LEXER" do
-      @post = Post.create!(:title => "āčē", :body => "dummy")
+      @post = Post.create!(title: "āčē", body: "dummy")
       @conn.add_context_index :posts, :title,
-        :lexer => { :type => "BASIC_LEXER", :base_letter_type => 'GENERIC', :base_letter => true }
-      Post.contains(:title, "āčē").all.should == [@post]
-      Post.contains(:title, "ace").all.should == [@post]
-      Post.contains(:title, "ACE").all.should == [@post]
+        lexer: { type: "BASIC_LEXER", base_letter_type: 'GENERIC', base_letter: true }
+      Post.contains(:title, "āčē").to_a.should == [@post]
+      Post.contains(:title, "ace").to_a.should == [@post]
+      Post.contains(:title, "ACE").to_a.should == [@post]
       @conn.remove_context_index :posts, :title
     end
 
     it "should create transactional index and sync index within transaction on inserts and updates" do
-      @conn.add_context_index :posts, :title, :transactional => true
+      @conn.add_context_index :posts, :title, transactional: true
       Post.transaction do
-        @post = Post.create(:title => "abc")
-        Post.contains(:title, "abc").all.should == [@post]
-        @post.update_attributes!(:title => "ghi")
-        Post.contains(:title, "ghi").all.should == [@post]
+        @post = Post.create(title: "abc")
+        Post.contains(:title, "abc").to_a.should == [@post]
+        @post.update_attributes!(title: "ghi")
+        Post.contains(:title, "ghi").to_a.should == [@post]
       end
       @conn.remove_context_index :posts, :title
     end
@@ -174,13 +174,15 @@ describe "OracleEnhancedAdapter context index" do
   describe "on multiple tables" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
+      @oracle12c = !! @conn.select_value(
+                      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) = 12")
       create_tables
       class ::Post < ActiveRecord::Base
-        has_many :comments, :dependent => :destroy
+        has_many :comments, dependent: :destroy
         has_context_index
       end
       class ::Comment < ActiveRecord::Base
-        belongs_to :post, :counter_cache => true
+        belongs_to :post, counter_cache: true
       end
     end
 
@@ -192,28 +194,31 @@ describe "OracleEnhancedAdapter context index" do
     end
 
     after(:each) do
+      @conn.remove_context_index :posts, name: 'post_and_comments_index' rescue nil
+      @conn.remove_context_index :posts, index_column: :all_text rescue nil
       Post.destroy_all
     end
 
     it "should create multiple table index with specified main index column" do
+      pending "It always fails when Oracle 12c 12.1.0 used." if @oracle12c
       @conn.add_context_index :posts,
         [:title, :body,
         # specify aliases always with AS keyword
         "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
         ],
-        :name => 'post_and_comments_index',
-        :index_column => :all_text, :index_column_trigger_on => [:updated_at, :comments_count],
-        :sync => 'ON COMMIT'
-      @post = Post.create!(:title => "aaa", :body => "bbb")
-      @post.comments.create!(:author => "ccc", :body => "ddd")
-      @post.comments.create!(:author => "eee", :body => "fff")
+        name: 'post_and_comments_index',
+        index_column: :all_text, index_column_trigger_on: [:updated_at, :comments_count],
+        sync: 'ON COMMIT'
+      @post = Post.create!(title: "aaa", body: "bbb")
+      @post.comments.create!(author: "ccc", body: "ddd")
+      @post.comments.create!(author: "eee", body: "fff")
       ["aaa", "bbb", "ccc", "ddd", "eee", "fff"].each do |word|
-        Post.contains(:all_text, word).all.should == [@post]
+        Post.contains(:all_text, word).to_a.should == [@post]
       end
-      @conn.remove_context_index :posts, :name => 'post_and_comments_index'
     end
 
     it "should create multiple table index with specified main index column (when subquery has newlines)" do
+      pending "It always fails when Oracle 12c 12.1.0 used." if @oracle12c
       @conn.add_context_index :posts,
         [:title, :body,
          # specify aliases always with AS keyword
@@ -223,36 +228,34 @@ describe "OracleEnhancedAdapter context index" do
             FROM comments
             WHERE comments.post_id = :id }
         ],
-        :name => 'post_and_comments_index',
-        :index_column => :all_text, :index_column_trigger_on => [:updated_at, :comments_count],
-        :sync => 'ON COMMIT'
-      @post = Post.create!(:title => "aaa", :body => "bbb")
-      @post.comments.create!(:author => "ccc", :body => "ddd")
-      @post.comments.create!(:author => "eee", :body => "fff")
+        name: 'post_and_comments_index',
+        index_column: :all_text, index_column_trigger_on: [:updated_at, :comments_count],
+        sync: 'ON COMMIT'
+      @post = Post.create!(title: "aaa", body: "bbb")
+      @post.comments.create!(author: "ccc", body: "ddd")
+      @post.comments.create!(author: "eee", body: "fff")
       ["aaa", "bbb", "ccc", "ddd", "eee", "fff"].each do |word|
-        Post.contains(:all_text, word).all.should == [@post]
+        Post.contains(:all_text, word).to_a.should == [@post]
       end
-      @conn.remove_context_index :posts, :name => 'post_and_comments_index'
     end
 
     it "should find by search term within specified field" do
-      @post = Post.create!(:title => "aaa", :body => "bbb")
-      @post.comments.create!(:author => "ccc", :body => "ddd")
+      @post = Post.create!(title: "aaa", body: "bbb")
+      @post.comments.create!(author: "ccc", body: "ddd")
       @conn.add_context_index :posts,
         [:title, :body,
         # specify aliases always with AS keyword
         "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
         ],
-        :index_column => :all_text
-      Post.contains(:all_text, "aaa within title").all.should == [@post]
-      Post.contains(:all_text, "aaa within body").all.should be_empty
-      Post.contains(:all_text, "bbb within body").all.should == [@post]
-      Post.contains(:all_text, "bbb within title").all.should be_empty
-      Post.contains(:all_text, "ccc within comment_author").all.should == [@post]
-      Post.contains(:all_text, "ccc within comment_body").all.should be_empty
-      Post.contains(:all_text, "ddd within comment_body").all.should == [@post]
-      Post.contains(:all_text, "ddd within comment_author").all.should be_empty
-      @conn.remove_context_index :posts, :index_column => :all_text
+        index_column: :all_text
+      Post.contains(:all_text, "aaa within title").to_a.should == [@post]
+      Post.contains(:all_text, "aaa within body").to_a.should be_empty
+      Post.contains(:all_text, "bbb within body").to_a.should == [@post]
+      Post.contains(:all_text, "bbb within title").to_a.should be_empty
+      Post.contains(:all_text, "ccc within comment_author").to_a.should == [@post]
+      Post.contains(:all_text, "ccc within comment_body").to_a.should be_empty
+      Post.contains(:all_text, "ddd within comment_body").to_a.should == [@post]
+      Post.contains(:all_text, "ddd within comment_author").to_a.should be_empty
     end
 
   end
@@ -264,7 +267,7 @@ describe "OracleEnhancedAdapter context index" do
       class ::Post < ActiveRecord::Base
         has_context_index
       end
-      @post = Post.create(:title => 'aaa', :body => 'bbb')
+      @post = Post.create(title: 'aaa', body: 'bbb')
       @tablespace = @conn.default_tablespace
       set_logger
       @conn = ActiveRecord::Base.connection
@@ -288,17 +291,17 @@ describe "OracleEnhancedAdapter context index" do
     end
 
     it "should create index on single column" do
-      @conn.add_context_index :posts, :title, :tablespace => @tablespace
+      @conn.add_context_index :posts, :title, tablespace: @tablespace
       verify_logged_statements
-      Post.contains(:title, 'aaa').all.should == [@post]
+      Post.contains(:title, 'aaa').to_a.should == [@post]
       @conn.remove_context_index :posts, :title
     end
 
     it "should create index on multiple columns" do
-      @conn.add_context_index :posts, [:title, :body], :name => 'index_posts_text', :tablespace => @conn.default_tablespace
+      @conn.add_context_index :posts, [:title, :body], name: 'index_posts_text', tablespace: @conn.default_tablespace
       verify_logged_statements
-      Post.contains(:title, 'aaa AND bbb').all.should == [@post]
-      @conn.remove_context_index :posts, :name => 'index_posts_text'
+      Post.contains(:title, 'aaa AND bbb').to_a.should == [@post]
+      @conn.remove_context_index :posts, name: 'index_posts_text'
     end
 
   end
@@ -325,7 +328,7 @@ describe "OracleEnhancedAdapter context index" do
 
       it "should dump definition of single column index" do
         @conn.add_context_index :posts, :title
-        standard_dump.should =~ /add_context_index "posts", \["title"\], :name => \"index_posts_on_title\"$/
+        standard_dump.should =~ /add_context_index "posts", \["title"\], name: \"index_posts_on_title\"$/
         @conn.remove_context_index :posts, :title
       end
 
@@ -337,47 +340,50 @@ describe "OracleEnhancedAdapter context index" do
 
       it "should dump definition of multiple table index with options" do
         options = {
-          :name => 'post_and_comments_index',
-          :index_column => :all_text, :index_column_trigger_on => :updated_at,
-          :transactional => true,
-          :sync => 'ON COMMIT'
+          name: 'post_and_comments_index',
+          index_column: :all_text, index_column_trigger_on: :updated_at,
+          transactional: true,
+          sync: 'ON COMMIT'
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
         standard_dump.should =~ /add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/
-        @conn.remove_context_index :posts, :name => 'post_and_comments_index'
+        @conn.remove_context_index :posts, name: 'post_and_comments_index'
       end
 
       it "should dump definition of multiple table index with options (when definition is larger than 4000 bytes)" do
         options = {
-          :name => 'post_and_comments_index',
-          :index_column => :all_text, :index_column_trigger_on => :updated_at,
-          :transactional => true,
-          :sync => 'ON COMMIT'
+          name: 'post_and_comments_index',
+          index_column: :all_text, index_column_trigger_on: :updated_at,
+          transactional: true,
+          sync: 'ON COMMIT'
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id#{' AND 1=1' * 500}"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
         standard_dump.should =~ /add_context_index "posts", \[:title, :body, "#{sub_query}"\], #{options.inspect[1..-2]}$/
-        @conn.remove_context_index :posts, :name => 'post_and_comments_index'
+        @conn.remove_context_index :posts, name: 'post_and_comments_index'
       end
 
       it "should dump definition of multiple table index with options (when subquery has newlines)" do
         options = {
-          :name => 'post_and_comments_index',
-          :index_column => :all_text, :index_column_trigger_on => :updated_at,
-          :transactional => true,
-          :sync => 'ON COMMIT'
+          name: 'post_and_comments_index',
+          index_column: :all_text, index_column_trigger_on: :updated_at,
+          transactional: true,
+          sync: 'ON COMMIT'
         }
         sub_query = "SELECT comments.author AS comment_author, comments.body AS comment_body\nFROM comments\nWHERE comments.post_id = :id"
         @conn.add_context_index :posts, [:title, :body, sub_query], options
         standard_dump.should =~ /add_context_index "posts", \[:title, :body, "#{sub_query.gsub(/\n/, ' ')}"\], #{options.inspect[1..-2]}$/
-        @conn.remove_context_index :posts, :name => 'post_and_comments_index'
+        @conn.remove_context_index :posts, name: 'post_and_comments_index'
       end
 
     end
 
     describe "with table prefix and suffix" do
       before(:all) do
+        @conn = ActiveRecord::Base.connection
+        @oracle12c = !! @conn.select_value(
+                        "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) = 12")
         ActiveRecord::Base.table_name_prefix = 'xxx_'
         ActiveRecord::Base.table_name_suffix = '_xxx'
         create_tables
@@ -391,7 +397,7 @@ describe "OracleEnhancedAdapter context index" do
 
       it "should dump definition of single column index" do
         schema_define { add_context_index :posts, :title }
-        standard_dump.should =~ /add_context_index "posts", \["title"\], :name => "i_xxx_posts_xxx_title"$/
+        standard_dump.should =~ /add_context_index "posts", \["title"\], name: "i_xxx_posts_xxx_title"$/
         schema_define { remove_context_index :posts, :title }
       end
 
@@ -402,12 +408,13 @@ describe "OracleEnhancedAdapter context index" do
       end
 
       it "should dump definition of multiple table index with options" do
+        pending "It always fails when Oracle 12c 12.1.0 used." if @oracle12c
         options = {
-          :name => 'xxx_post_and_comments_i',
-          :index_column => :all_text, :index_column_trigger_on => :updated_at,
-          :lexer => { :type => "BASIC_LEXER", :base_letter_type => 'GENERIC', :base_letter => true },
-          :wordlist => { :type => "BASIC_WORDLIST", :prefix_index => true },
-          :sync => 'ON COMMIT'
+          name: 'xxx_post_and_comments_i',
+          index_column: :all_text, index_column_trigger_on: :updated_at,
+          lexer: { type: "BASIC_LEXER", base_letter_type: 'GENERIC', base_letter: true },
+          wordlist: { type: "BASIC_WORDLIST", prefix_index: true },
+          sync: 'ON COMMIT'
         }
         schema_define do
           add_context_index :posts,
@@ -417,7 +424,7 @@ describe "OracleEnhancedAdapter context index" do
         end
         standard_dump.should =~ /add_context_index "posts", \[:title, :body, "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"\], #{
           options.inspect[1..-2].gsub(/[{}]/){|s| '\\'<<s }}$/
-        schema_define { remove_context_index :posts, :name => 'xxx_post_and_comments_i' }
+        schema_define { remove_context_index :posts, name: 'xxx_post_and_comments_i' }
       end
 
     end