activerecord-oracle_enhanced-adapter 1.7.11 → 1.8.0.beta1

data/lib/active_record/oracle_enhanced/type/boolean.rb

@@ -2,19 +2,16 @@ module ActiveRecord
   module OracleEnhanced
     module Type
       class Boolean < ActiveModel::Type::Boolean # :nodoc:
-        # Add 'N' as FALSE_VALUES
-        FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF', 'n', 'N'].to_set
-
         private
 
-        def cast_value(value)
-          # Not calling super to use its own `FALSE_VALUES`
-          if value == ''
-            nil
-          else
-            !FALSE_VALUES.include?(value)
+          def cast_value(value)
+            # Kind of adding 'n' and 'N' to  `FALSE_VALUES`
+            if ["n", "N"].include?(value)
+              false
+            else
+              super
+            end
           end
-        end
       end
     end
   end

data/lib/active_record/oracle_enhanced/type/integer.rb

@@ -1,13 +1,12 @@
-#TODO Need to consider namespace change since paremt class moved to ActiveModel
 module ActiveRecord
   module OracleEnhanced
     module Type
       class Integer < ActiveModel::Type::Integer # :nodoc:
         private
 
-        def max_value
-          ("9"*38).to_i
-        end
+          def max_value
+            ("9" * 38).to_i
+          end
       end
     end
   end

data/lib/active_record/oracle_enhanced/type/national_character_string.rb

@@ -1,4 +1,4 @@
-require 'active_model/type/string'
+require "active_model/type/string"
 
 module ActiveRecord
   module OracleEnhanced

data/lib/active_record/oracle_enhanced/type/raw.rb

@@ -1,6 +1,5 @@
-require 'active_model/type/string'
+require "active_model/type/string"
 
-#TODO Need to consider namespace change since paremt class moved to ActiveModel
 module ActiveRecord
   module OracleEnhanced
     module Type
@@ -14,7 +13,7 @@ module ActiveRecord
           if value.nil?
             super
           else
-            value = value.unpack('C*')
+            value = value.unpack("C*")
             value.map { |x| "%02X" % x }.join
           end
         end

data/lib/active_record/oracle_enhanced/type/string.rb

@@ -1,4 +1,4 @@
-require 'active_model/type/string'
+require "active_model/type/string"
 
 module ActiveRecord
   module OracleEnhanced
@@ -15,7 +15,7 @@ module ActiveRecord
 
         def changed_in_place?(raw_old_value, new_value)
           if raw_old_value.nil?
-            new_value = nil if new_value == ''
+            new_value = nil if new_value == ""
             raw_old_value != new_value
           else
             super

data/lib/active_record/oracle_enhanced/type/text.rb

@@ -1,9 +1,9 @@
-require 'active_model/type/string'
+require "active_model/type/string"
 
 module ActiveRecord
   module OracleEnhanced
     module Type
-      class Text < ActiveModel::Type::Text # :nodoc:
+      class Text < ActiveRecord::Type::Text # :nodoc:
         def changed_in_place?(raw_old_value, new_value)
           #TODO: Needs to find a way not to cast here.
           raw_old_value = cast(raw_old_value)

data/lib/activerecord-oracle_enhanced-adapter.rb

@@ -3,11 +3,11 @@ if defined?(Rails)
     module ConnectionAdapters
       class OracleEnhancedRailtie < ::Rails::Railtie
         rake_tasks do
-          load 'active_record/connection_adapters/oracle_enhanced/database_tasks.rb'
+          load "active_record/connection_adapters/oracle_enhanced/database_tasks.rb"
         end
 
         ActiveSupport.on_load(:active_record) do
-          require 'active_record/connection_adapters/oracle_enhanced_adapter'
+          require "active_record/connection_adapters/oracle_enhanced_adapter"
 
           # Cache column descriptions between requests in test and production environments
           if Rails.env.test? || Rails.env.production?

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter establish connection" do
 
   it "should connect to database" do
@@ -41,77 +39,6 @@ describe "OracleEnhancedAdapter" do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
   end
 
-  describe "ignore specified table columns" do
-    before(:all) do
-      @conn = ActiveRecord::Base.connection
-      @conn.execute "DROP TABLE test_employees" rescue nil
-      @conn.execute <<-SQL
-        CREATE TABLE test_employees (
-          id            NUMBER PRIMARY KEY,
-          first_name    VARCHAR2(20),
-          last_name     VARCHAR2(25),
-          email         VARCHAR2(25),
-          phone_number  VARCHAR2(20),
-          hire_date     DATE,
-          job_id        NUMBER,
-          salary        NUMBER,
-          commission_pct  NUMBER(2,2),
-          manager_id    NUMBER(6),
-          department_id NUMBER(4,0),
-          created_at    DATE
-        )
-      SQL
-      @conn.execute "DROP SEQUENCE test_employees_seq" rescue nil
-      @conn.execute <<-SQL
-        CREATE SEQUENCE test_employees_seq  MINVALUE 1
-          INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
-      SQL
-    end
-
-    after(:all) do
-      @conn.execute "DROP TABLE test_employees"
-      @conn.execute "DROP SEQUENCE test_employees_seq"
-    end
-
-    after(:each) do
-      Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.connection.clear_ignored_table_columns
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
-    end
-
-    it "should ignore specified table columns" do
-      class ::TestEmployee < ActiveRecord::Base
-        ignore_table_columns  :phone_number, :hire_date
-      end
-      expect(TestEmployee.connection.columns('test_employees').select{|c| ['phone_number','hire_date'].include?(c.name) }).to be_empty
-    end
-
-    it "should ignore specified table columns specified in several lines" do
-      class ::TestEmployee < ActiveRecord::Base
-        ignore_table_columns  :phone_number
-        ignore_table_columns  :hire_date
-      end
-      expect(TestEmployee.connection.columns('test_employees').select{|c| ['phone_number','hire_date'].include?(c.name) }).to be_empty
-    end
-
-    it "should not ignore unspecified table columns" do
-      class ::TestEmployee < ActiveRecord::Base
-        ignore_table_columns  :phone_number, :hire_date
-      end
-      expect(TestEmployee.connection.columns('test_employees').select{|c| c.name == 'email' }).not_to be_empty
-    end
-
-    it "should ignore specified table columns in other connection" do
-      class ::TestEmployee < ActiveRecord::Base
-        ignore_table_columns  :phone_number, :hire_date
-      end
-      # establish other connection
-      other_conn = ActiveRecord::Base.oracle_enhanced_connection(CONNECTION_PARAMS)
-      expect(other_conn.columns('test_employees').select{|c| ['phone_number','hire_date'].include?(c.name) }).to be_empty
-    end
-
-  end
-
   describe "cache table columns" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -134,7 +61,7 @@ describe "OracleEnhancedAdapter" do
           hire_date     DATE
         )
       SQL
-      @column_names = ['id', 'first_name', 'last_name', 'full_name', 'hire_date']
+      @column_names = ["id", "first_name", "last_name", "full_name", "hire_date"]
       @column_sql_types = ["NUMBER", "VARCHAR2(20)", "VARCHAR2(25)", "VARCHAR2(46)", "DATE"]
       class ::TestEmployee < ActiveRecord::Base
       end
@@ -151,7 +78,7 @@ describe "OracleEnhancedAdapter" do
       @conn.execute "DROP TABLE test_employees"
       @conn.execute "DROP TABLE test_employees_without_pk"
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     before(:each) do
@@ -170,33 +97,33 @@ describe "OracleEnhancedAdapter" do
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = false
       end
 
-      it 'should identify virtual columns as such' do
+      it "should identify virtual columns as such" do
         skip "Not supported in this database version" unless @oracle11g_or_higher
-        te = TestEmployee.connection.columns('test_employees').detect(&:virtual?)
-        expect(te.name).to eq('full_name')
+        te = TestEmployee.connection.columns("test_employees").detect(&:virtual?)
+        expect(te.name).to eq("full_name")
       end
 
       it "should get columns from database at first time" do
-        expect(TestEmployee.connection.columns('test_employees').map(&:name)).to eq(@column_names)
+        expect(TestEmployee.connection.columns("test_employees").map(&:name)).to eq(@column_names)
         expect(@logger.logged(:debug).last).to match(/select .* from all_tab_cols/im)
       end
 
       it "should get columns from database at second time" do
-        TestEmployee.connection.columns('test_employees')
+        TestEmployee.connection.columns("test_employees")
         @logger.clear(:debug)
-        expect(TestEmployee.connection.columns('test_employees').map(&:name)).to eq(@column_names)
+        expect(TestEmployee.connection.columns("test_employees").map(&:name)).to eq(@column_names)
         expect(@logger.logged(:debug).last).to match(/select .* from all_tab_cols/im)
       end
 
       it "should get primary key from database at first time" do
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         expect(@logger.logged(:debug).last).to match(/select .* from all_constraints/im)
       end
 
       it "should get primary key from database at first time" do
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         @logger.clear(:debug)
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         expect(@logger.logged(:debug).last).to match(/select .* from all_constraints/im)
       end
 
@@ -216,33 +143,33 @@ describe "OracleEnhancedAdapter" do
       end
 
       it "should get columns from database at first time" do
-        expect(TestEmployee.connection.columns('test_employees').map(&:name)).to eq(@column_names)
+        expect(TestEmployee.connection.columns("test_employees").map(&:name)).to eq(@column_names)
         expect(@logger.logged(:debug).last).to match(/select .* from all_tab_cols/im)
       end
 
       it "should get columns from cache at second time" do
-        TestEmployee.connection.columns('test_employees')
+        TestEmployee.connection.columns("test_employees")
         @logger.clear(:debug)
-        expect(TestEmployee.connection.columns('test_employees').map(&:name)).to eq(@column_names)
+        expect(TestEmployee.connection.columns("test_employees").map(&:name)).to eq(@column_names)
         expect(@logger.logged(:debug).last).to be_blank
       end
 
       it "should get primary key from database at first time" do
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         expect(@logger.logged(:debug).last).to match(/select .* from all_constraints/im)
       end
 
       it "should get primary key from cache at first time" do
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         @logger.clear(:debug)
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees')).to eq(['id', nil])
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees")).to eq(["id", nil])
         expect(@logger.logged(:debug).last).to be_blank
       end
 
       it "should store primary key as nil in cache at first time for table without primary key" do
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees_without_pk')).to eq(nil)
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees_without_pk")).to eq(nil)
         @logger.clear(:debug)
-        expect(TestEmployee.connection.pk_and_sequence_for('test_employees_without_pk')).to eq(nil)
+        expect(TestEmployee.connection.pk_and_sequence_for("test_employees_without_pk")).to eq(nil)
         expect(@logger.logged(:debug).last).to be_blank
       end
 
@@ -261,7 +188,7 @@ describe "OracleEnhancedAdapter" do
           name          VARCHAR2(50)
         )
       SQL
-      Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
+      Object.send(:remove_const, "CompositePrimaryKeys") if defined?(CompositePrimaryKeys)
       class ::TestEmployee < ActiveRecord::Base
         self.primary_key = :employee_id
       end
@@ -270,7 +197,7 @@ describe "OracleEnhancedAdapter" do
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       @conn.execute "DROP TABLE test_employees"
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should tell ActiveRecord that count distinct is supported" do
@@ -302,7 +229,7 @@ describe "OracleEnhancedAdapter" do
       end
       Object.send(:remove_const, "TestReservedWord")
       ActiveRecord::Base.table_name_prefix = nil
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     before(:each) do
@@ -321,9 +248,9 @@ describe "OracleEnhancedAdapter" do
 
     it "should create record" do
       attrs = {
-        :varchar2 => 'dummy',
-        :integer => 1,
-        :comment => 'dummy'
+        varchar2: "dummy",
+        integer: 1,
+        comment: "dummy"
       }
       record = TestReservedWord.create!(attrs)
       record.reload
@@ -442,7 +369,7 @@ describe "OracleEnhancedAdapter" do
         self.table_name = "warehouse-things"
       end
 
-      wh = WarehouseThing.create!(:name => "Foo", :foo => 2)
+      wh = WarehouseThing.create!(name: "Foo", foo: 2)
       expect(wh.id).not_to be_nil
 
       expect(@conn.tables).to include("warehouse-things")
@@ -454,14 +381,14 @@ describe "OracleEnhancedAdapter" do
         self.table_name = "CamelCase"
       end
 
-      cc = CamelCase.create!(:name => "Foo", :foo => 2)
+      cc = CamelCase.create!(name: "Foo", foo: 2)
       expect(cc.id).not_to be_nil
 
       expect(@conn.tables).to include("CamelCase")
     end
 
     it "properly quotes database links" do
-      expect(@conn.quote_table_name('asdf@some.link')).to eq('"ASDF"@"SOME.LINK"')
+      expect(@conn.quote_table_name("asdf@some.link")).to eq('"ASDF"@"SOME.LINK"')
     end
   end
 
@@ -495,11 +422,11 @@ describe "OracleEnhancedAdapter" do
       @conn.execute "DROP DATABASE LINK #{@db_link}" rescue nil
       @sys_conn.drop_table :test_posts rescue nil
       Object.send(:remove_const, "TestPost") rescue nil
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should verify database link" do
-      @conn.select_value("select * from dual@#{@db_link}") == 'X'
+      @conn.select_value("select * from dual@#{@db_link}") == "X"
     end
 
     it "should get column names" do
@@ -507,7 +434,7 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should create record" do
-      p = TestPost.create(:title => "Title", :body => "Body")
+      p = TestPost.create(title: "Title", body: "Body")
       expect(p.id).not_to be_nil
       expect(TestPost.find(p.id)).not_to be_nil
     end
@@ -521,7 +448,7 @@ describe "OracleEnhancedAdapter" do
 
     it "should get current database name" do
       # get database name if using //host:port/database connection string
-      database_name = CONNECTION_PARAMS[:database].split('/').last
+      database_name = CONNECTION_PARAMS[:database].split("/").last
       expect(@conn.current_database.upcase).to eq(database_name.upcase)
     end
 
@@ -532,25 +459,25 @@ describe "OracleEnhancedAdapter" do
 
   describe "temporary tables" do
     before(:all) do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = 'UNUSED'
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = 'UNUSED'
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = "UNUSED"
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:clob] = "UNUSED"
       @conn = ActiveRecord::Base.connection
     end
     after(:all) do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces={}
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces = {}
     end
 
     after(:each) do
       @conn.drop_table :foos rescue nil
     end
     it "should create ok" do
-      @conn.create_table :foos, :temporary => true, :id => false do |t|
+      @conn.create_table :foos, temporary: true, id: false do |t|
         t.integer :id
         t.text :bar
       end
     end
     it "should show up as temporary" do
-      @conn.create_table :foos, :temporary => true, :id => false do |t|
+      @conn.create_table :foos, temporary: true, id: false do |t|
         t.integer :id
       end
       expect(@conn.temporary_table?("foos")).to be_truthy
@@ -578,8 +505,8 @@ describe "OracleEnhancedAdapter" do
       @ids = (1..1010).to_a
       TestPost.transaction do
         @ids.each do |id|
-          TestPost.create!(:id => id, :title => "Title #{id}")
-          TestComment.create!(:test_post_id => id, :description => "Description #{id}")
+          TestPost.create!(id: id, title: "Title #{id}")
+          TestComment.create!(test_post_id: id, description: "Description #{id}")
         end
       end
     end
@@ -591,7 +518,7 @@ describe "OracleEnhancedAdapter" do
       end
       Object.send(:remove_const, "TestPost")
       Object.send(:remove_const, "TestComment")
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should load included association with more than 1000 records" do
@@ -603,7 +530,7 @@ describe "OracleEnhancedAdapter" do
 
   describe "with statement pool" do
     before(:all) do
-      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(:statement_limit => 3))
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(statement_limit: 3))
       @conn = ActiveRecord::Base.connection
       schema_define do
         drop_table :test_posts rescue nil
@@ -623,7 +550,7 @@ describe "OracleEnhancedAdapter" do
         drop_table :test_posts
       end
       Object.send(:remove_const, "TestPost")
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should clear older cursors when statement limit is reached" do
@@ -671,17 +598,17 @@ describe "OracleEnhancedAdapter" do
         drop_table :test_posts
       end
       Object.send(:remove_const, "TestPost")
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should explain query" do
-      explain = TestPost.where(:id => 1).explain
+      explain = TestPost.where(id: 1).explain
       expect(explain).to include("Cost")
       expect(explain).to include("INDEX UNIQUE SCAN")
     end
 
     it "should explain query with binds" do
-      pending "Pending until further investigation made for #908" if RUBY_ENGINE == 'jruby'
+      pending "Pending until further investigation made for #908" if RUBY_ENGINE == "jruby"
       pk = TestPost.columns_hash[TestPost.primary_key]
       sub = Arel::Nodes::BindParam.new.to_sql
       binds = [ActiveRecord::Relation::QueryAttribute.new(pk, 1, ActiveRecord::Type::Integer.new)]
@@ -714,11 +641,11 @@ describe "OracleEnhancedAdapter" do
         self.table_name = :test_employees
       end
       i = 0
-      @employee.create!(sort_order: i+=1, first_name: 'Peter',   last_name: 'Parker')
-      @employee.create!(sort_order: i+=1, first_name: 'Tony',    last_name: 'Stark')
-      @employee.create!(sort_order: i+=1, first_name: 'Steven',  last_name: 'Rogers')
-      @employee.create!(sort_order: i+=1, first_name: 'Bruce',   last_name: 'Banner')
-      @employee.create!(sort_order: i+=1, first_name: 'Natasha', last_name: 'Romanova')
+      @employee.create!(sort_order: i += 1, first_name: "Peter",   last_name: "Parker")
+      @employee.create!(sort_order: i += 1, first_name: "Tony",    last_name: "Stark")
+      @employee.create!(sort_order: i += 1, first_name: "Steven",  last_name: "Rogers")
+      @employee.create!(sort_order: i += 1, first_name: "Bruce",   last_name: "Banner")
+      @employee.create!(sort_order: i += 1, first_name: "Natasha", last_name: "Romanova")
     end
 
     after(:all) do
@@ -727,8 +654,7 @@ describe "OracleEnhancedAdapter" do
     end
 
     after(:each) do
-      ActiveRecord::Base.connection.clear_ignored_table_columns
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should return n records with limit(n)" do
@@ -762,7 +688,7 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "returns true when passed a valid type" do
-      column = @conn.columns('test_employees').find { |col| col.name == 'first_name' }
+      column = @conn.columns("test_employees").find { |col| col.name == "first_name" }
       expect(@conn.valid_type?(column.type)).to be true
     end
 
@@ -771,7 +697,7 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
-  describe 'serialized column' do
+  describe "serialized column" do
     before(:all) do
       schema_define do
         create_table :test_serialized_columns do |t|
@@ -787,9 +713,9 @@ describe "OracleEnhancedAdapter" do
       schema_define do
         drop_table :test_serialized_columns
       end
-      Object.send(:remove_const, 'TestSerializedColumn')
+      Object.send(:remove_const, "TestSerializedColumn")
       ActiveRecord::Base.table_name_prefix = nil
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     before(:each) do
@@ -800,8 +726,8 @@ describe "OracleEnhancedAdapter" do
       clear_logger
     end
 
-    it 'should serialize' do
-      new_value = 'new_value'
+    it "should serialize" do
+      new_value = "new_value"
       serialized_column = TestSerializedColumn.new
 
       expect(serialized_column.serialized).to eq([])