activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.0.beta1

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

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module OracleEnhanced
+    module Type
+      class Integer < ActiveRecord::Type::Integer # :nodoc:
+        private
+
+        def max_value
+          ("9"*38).to_i
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'active_record/type/string'
+
+module ActiveRecord
+  module OracleEnhanced
+    module Type
+      class Raw < ActiveRecord::Type::String # :nodoc:
+        def type
+          :raw
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module OracleEnhanced
+    module Type
+      class Timestamp < ActiveRecord::Type::Value # :nodoc:
+        def type
+          :timestamp
+        end
+      end
+    end
+  end
+end

data/lib/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_database_tasks.rb'
+          load 'active_record/connection_adapters/oracle_enhanced/database_tasks.rb'
         end
 
         ActiveSupport.on_load(:active_record) do

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -476,7 +476,7 @@ describe "OracleEnhancedAdapter" do
         t.string      :title
         # cannot update LOBs over database link
         t.string      :body
-        t.timestamps
+        t.timestamps null: true
       end
       @db_link_username = SYSTEM_CONNECTION_PARAMS[:username]
       @db_link_password = SYSTEM_CONNECTION_PARAMS[:password]
@@ -628,8 +628,8 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should clear older cursors when statement limit is reached" do
-      pk = TestPost.columns.find { |c| c.primary }
-      sub = @conn.substitute_at(pk, 0)
+      pk = TestPost.columns_hash[TestPost.primary_key]
+      sub = @conn.substitute_at(pk, 0).to_sql
       binds = [[pk, 1]]
 
       lambda {
@@ -641,8 +641,8 @@ describe "OracleEnhancedAdapter" do
 
     it "should cache UPDATE statements with bind variables" do
       lambda {
-        pk = TestPost.columns.find { |c| c.primary }
-        sub = @conn.substitute_at(pk, 0)
+        pk = TestPost.columns_hash[TestPost.primary_key]
+        sub = @conn.substitute_at(pk, 0).to_sql
         binds = [[pk, 1]]
         @conn.exec_update("UPDATE test_posts SET id = #{sub}", "SQL", binds)
       }.should change(@statements, :length).by(+1)
@@ -682,36 +682,11 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should explain query with binds" do
-      pk = TestPost.columns.find { |c| c.primary }
+      pk = TestPost.columns_hash[TestPost.primary_key]
       sub = @conn.substitute_at(pk, 0)
       explain = TestPost.where(TestPost.arel_table[pk.name].eq(sub)).bind([pk, 1]).explain
       explain.should include("Cost")
       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

@@ -227,7 +227,7 @@ describe "OracleEnhancedConnection" do
 
     it "should execute prepared statement with decimal bind parameter " do
       cursor = @conn.prepare("INSERT INTO test_employees VALUES(:1)")
-      column = ActiveRecord::ConnectionAdapters::OracleEnhancedColumn.new('age', nil, 'NUMBER(10,2)')
+      column = ActiveRecord::ConnectionAdapters::OracleEnhancedColumn.new('age', nil, ActiveRecord::Type::Decimal.new, 'NUMBER(10,2)')
       column.type.should == :decimal
       cursor.bind_param(1, "1.5", column)
       cursor.exec

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -11,7 +11,7 @@ describe "OracleEnhancedAdapter context index" do
         t.string :title
         t.text :body
         t.integer :comments_count
-        t.timestamps
+        t.timestamps null: true
         t.string :all_text, limit: 2 # will be used for multi-column index
       end
     end
@@ -23,7 +23,7 @@ describe "OracleEnhancedAdapter context index" do
         t.integer :post_id
         t.string :author
         t.text :body
-        t.timestamps
+        t.timestamps null: true
       end
     end
   end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -67,12 +67,12 @@ describe "OracleEnhancedAdapter composite_primary_keys support" do
           t.string  :type_category, :limit => 15, :null => false  
           t.date    :date_value, :null => false
           t.text    :results, :null => false
-          t.timestamps
+          t.timestamps null: true
         end
         create_table :non_cpk_write_lobs_test, :force => true do |t|
           t.date    :date_value, :null => false
           t.text    :results, :null => false
-          t.timestamps
+          t.timestamps null: true
         end
       end
       class ::CpkWriteLobsTest < ActiveRecord::Base

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -67,21 +67,21 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(Time.now).class.should == Time
+    column.type_cast_from_database(Time.now).class.should == Time
   end
 
   it "should return Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(Time.now).class.should == Date
+    column.type_cast_from_database(Time.now).class.should == Date
   end
 
   it "should typecast DateTime value to Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(DateTime.new(1900,1,1)).class.should == Date
+    column.type_cast_from_database(DateTime.new(1900,1,1)).class.should == Date
   end
 
   describe "/ DATE values from ActiveRecord model" do
@@ -206,7 +206,6 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         job_id        NUMBER,
         salary        NUMBER,
         commission_pct  NUMBER(2,2),
-        unwise_name_id NUMBER(2,2),
         manager_id    NUMBER(6),
         is_manager    NUMBER(1),
         department_id NUMBER(4,0),
@@ -219,46 +218,17 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
-
+  
   after(:all) do
     @conn.execute "DROP TABLE test2_employees"
     @conn.execute "DROP SEQUENCE test2_employees_seq"
   end
 
-  context "when number_datatype_coercion is :decimal" do
-    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-    it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "job_id"}
-      column.type.should == :decimal
-    end
-
-    it "should set NUMBER column type as decimal if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "salary"}
-      column.type.should == :decimal
-    end
-  end
-
-  context "when number_datatype_coercion is :float" do
-    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-    it "should set NUMBER column type as float if emulate_integers_by_column_name is false" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "job_id"}
-      column.type.should == :float
-    end
-
-    it "should set NUMBER column type as float if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "salary"}
-      column.type.should == :float
-    end
+  it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "job_id"}
+    column.type.should == :decimal
   end
 
   it "should set NUMBER column type as integer if emulate_integers_by_column_name is true" do
@@ -270,24 +240,10 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type.should == :integer
   end
 
-  it "should set NUMBER(p,0) column type as integer" do
+  it "should set NUMBER column type as decimal if column name does not contain 'id' and emulate_integers_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "department_id"}
-    column.type.should == :integer
-  end
-
-  it "should set NUMBER(p,s) column type as integer if column name ends with '_id' and emulate_integers_by_column_name is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-    columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "unwise_name_id"}
-    column.type.should == :integer
-  end
-
-  it "should set NUMBER(p,s) column type as decimal if column name ends with '_id' and emulate_integers_by_column_name is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-    columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "unwise_name_id"}
+    column = columns.detect{|c| c.name == "salary"}
     column.type.should == :decimal
   end
 
@@ -295,14 +251,14 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
     columns = @conn.columns('test2_employees')
     column = columns.detect{|c| c.name == "job_id"}
-    column.type_cast(1.0).class.should == BigDecimal
+    column.type_cast_from_database(1.0).class.should == BigDecimal
   end
 
-  it "should return Fixnum value from NUMBER column if column name ends with '_id' and emulate_integers_by_column_name is true" do
+  it "should return Fixnum value from NUMBER column if column name contains 'id' and emulate_integers_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
     column = columns.detect{|c| c.name == "job_id"}
-    column.type_cast(1.0).class.should == Fixnum
+    column.type_cast_from_database(1.0).class.should == Fixnum
   end
 
   describe "/ NUMBER values from ActiveRecord model" do
@@ -310,7 +266,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       class ::Test2Employee < ActiveRecord::Base
       end
     end
-
+    
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
       @conn.clear_types_for_columns
@@ -452,7 +408,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     columns = @conn.columns('test3_employees')
     %w(has_email has_phone active_flag manager_yn).each do |col|
       column = columns.detect{|c| c.name == col}
-      column.type_cast("Y").class.should == String
+      column.type_cast_from_database("Y").class.should == String
     end
   end
 
@@ -461,8 +417,8 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     columns = @conn.columns('test3_employees')
     %w(has_email has_phone active_flag manager_yn).each do |col|
       column = columns.detect{|c| c.name == col}
-      column.type_cast("Y").class.should == TrueClass
-      column.type_cast("N").class.should == FalseClass
+      column.type_cast_from_database("Y").class.should == TrueClass
+      column.type_cast_from_database("N").class.should == FalseClass
     end
   end
 
@@ -650,6 +606,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
 end
 
+
 describe "OracleEnhancedAdapter date and timestamp with different NLS date formats" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -906,7 +863,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
-
+  
 end
 
 describe "OracleEnhancedAdapter handling of CLOB columns" do
@@ -1383,6 +1340,7 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
   end
 end
 
+
 describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -1443,3 +1401,45 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   end
 
 end
+
+describe "OracleEnhancedAdapter handling of BINARY_FLOAT columns" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    @conn.execute "DROP TABLE test2_employees" rescue nil
+    @conn.execute <<-SQL
+      CREATE TABLE test2_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),
+        hourly_rate   BINARY_FLOAT,
+        manager_id    NUMBER(6),
+        is_manager    NUMBER(1),
+        department_id NUMBER(4,0),
+        created_at    DATE
+      )
+    SQL
+    @conn.execute "DROP SEQUENCE test2_employees_seq" rescue nil
+    @conn.execute <<-SQL
+      CREATE SEQUENCE test2_employees_seq  MINVALUE 1
+        INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
+    SQL
+  end
+  
+  after(:all) do
+    @conn.execute "DROP TABLE test2_employees"
+    @conn.execute "DROP SEQUENCE test2_employees_seq"
+  end
+
+  it "should set BINARY_FLOAT column type as float" do
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "hourly_rate"}
+    column.type.should == :float
+  end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'active_record/connection_adapters/oracle_enhanced_database_tasks'
+require 'active_record/connection_adapters/oracle_enhanced/database_tasks'
 require 'stringio'
 require 'tempfile'
 

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -16,7 +16,6 @@ if ActiveRecord::Base.method_defined?(:changed?)
           last_name     VARCHAR2(25),
           job_id        NUMBER(6,0) NULL,
           salary        NUMBER(8,2),
-          pto_per_hour  NUMBER,
           comments      CLOB,
           hire_date     DATE
         )
@@ -28,7 +27,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       class TestEmployee < ActiveRecord::Base
       end
     end
-
+  
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       @conn.execute "DROP TABLE test_employees"
@@ -63,16 +62,6 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee.should_not be_changed
     end
 
-    it "should not mark empty float (stored as NULL) as changed when reassigning it" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion) { :float }
-      @employee = TestEmployee.create!(:pto_per_hour => '')
-      @employee.pto_per_hour = ''
-      @employee.should_not be_changed
-      @employee.reload
-      @employee.pto_per_hour = ''
-      @employee.should_not be_changed
-    end
-
     it "should not mark empty text (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:comments => nil)
       @employee.comments = nil
@@ -122,7 +111,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee = TestEmployee.new
       @employee.job_id = 0
       @employee.save!.should be_true
-
+      
       @employee.should_not be_changed
 
       @employee.job_id = '0'
@@ -147,6 +136,11 @@ if ActiveRecord::Base.method_defined?(:changed?)
       end
     end
 
+    it "should be able to handle attributes which are not backed by a column" do
+      TestEmployee.create!(:comments => "initial")
+      @employee = TestEmployee.select("#{TestEmployee.quoted_table_name}.*, 24 ranking").first
+      expect { @employee.ranking = 25 }.to_not raise_error
+    end
   end
 
 end