activerecord-oracle_enhanced-adapter 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6010dec5446b296a5ad3d372f6aaad1ac71549
-  data.tar.gz: c82a83f8d18e75b367925eb029f786b567e1f6e4
+  metadata.gz: b1f1f3ee668e111001b017dd37db4d5e70bb315f
+  data.tar.gz: 10e4fdff8ab461b4e48ac248e8a61ccaa4fd1870
 SHA512:
-  metadata.gz: 8887e65c6d08ede8097bdeb8951227edd05c92c943074853fb6caf16009033af74407d24d03da3ca9184aa0b37633939fec5174f07aac38d85ef84abdbd620f6
-  data.tar.gz: 0f3843a406fbe8945785b85ee849debb10636e82161b7423da0643bb6c2c3ee8f92b2bf0e5e46b5ec577ebdeda0d9020c63b8fa1624f7a325b5d9c110f72372e
+  metadata.gz: 58dddb4992f8ae81c79ee379d0c26a0dcfe869df5e052e1892679a9f03ba440b623fe7b6b2d6c4a85e589bc80989b47e1285d8ad9139e19a64e249872701d566
+  data.tar.gz: d42acd789d7733e82e7e70d8c81c453e9dbd0a3a3dc0b196901ed9552ad09580540559ee5dbb0ec30102ef83d389b313ba932bfe22dc5c7ef0cefda1347ff1db

data/History.md

@@ -1,3 +1,17 @@
+## 1.5.5 / 2014-05-23
+
+* Enhancements
+ * Oracle NUMBER datatype can be handled as Rails :float datatype [#418]
+   - Default NUMBER datatype handled as :decimal to keep compatibility
+   - Configured by setting `self.number_datatype_coercion = :float` 
+ * Add link to supported Oracle database version, JDK and Oracle JDBC Driver version [#438]
+ * Support `without_prepared_statements?` to handle `unprepared_statement` [#447]
+
+* Bug Fix
+  * Associations with name `record` do not work correctly since Rails 4 [#435]
+  * Skip another Oracle Text test when Oracle 12c used [#437]
+  * Tag bind params with a bind param object [#444]
+
 ## 1.5.4 / 2014-03-25
 
 * Enhancements

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.5.4"
+  s.version = "1.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2014-03-25}
+  s.date = %q{2014-05-23}
   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.
 }

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -271,6 +271,13 @@ module ActiveRecord
       cattr_accessor :emulate_dates_by_column_name
       self.emulate_dates_by_column_name = false
 
+      ##
+      # :singleton-method:
+      # Specify how `NUMBER` datatype columns, without precision and scale, are handled in Rails world.
+      # Default is :decimal and other valid option is :float. Be wary of setting it to other values.
+      cattr_accessor :number_datatype_coercion
+      self.number_datatype_coercion = :decimal
+
       # Check column name to identify if it is Date (and not Time) column.
       # Is used if +emulate_dates_by_column_name+ option is set to +true+.
       # Override this method definition in initializer file if different Date column recognition is needed.
@@ -305,7 +312,7 @@ module ActiveRecord
       # Is used if +emulate_integers_by_column_name+ option is set to +true+.
       # Override this method definition in initializer file if different Integer column recognition is needed.
       def self.is_integer_column?(name, table_name = nil)
-        name =~ /(^|_)id$/i
+        !!(name =~ /(^|_)id$/i)
       end
 
       ##
@@ -389,6 +396,7 @@ module ActiveRecord
         @enable_dbms_output = false
         if config.fetch(:prepared_statements) { true }
           @visitor = Arel::Visitors::Oracle.new self
+          @prepared_statements = true
         else
           @visitor = unprepared_visitor
         end
@@ -420,6 +428,8 @@ module ActiveRecord
         true
       end
 
+      NUMBER_MAX_PRECISION = 38
+
       #:stopdoc:
       DEFAULT_NLS_PARAMETERS = {
         :nls_calendar            => nil,
@@ -443,10 +453,10 @@ module ActiveRecord
 
       #:stopdoc:
       NATIVE_DATABASE_TYPES = {
-        :primary_key => "NUMBER(38) NOT NULL PRIMARY KEY",
+        :primary_key => "NUMBER(#{NUMBER_MAX_PRECISION}) NOT NULL PRIMARY KEY",
         :string      => { :name => "VARCHAR2", :limit => 255 },
         :text        => { :name => "CLOB" },
-        :integer     => { :name => "NUMBER", :limit => 38 },
+        :integer     => { :name => "NUMBER", :limit => NUMBER_MAX_PRECISION },
         :float       => { :name => "NUMBER" },
         :decimal     => { :name => "DECIMAL" },
         :datetime    => { :name => "DATE" },
@@ -728,7 +738,7 @@ module ActiveRecord
       end
 
       def substitute_at(column, index)
-        Arel.sql(":a#{index + 1}")
+        Arel::Nodes::BindParam.new (":a#{index + 1}")
       end
 
       def clear_cache!
@@ -742,7 +752,7 @@ module ActiveRecord
         log(sql, name, type_casted_binds) do
           cursor = nil
           cached = false
-          if binds.empty?
+          if without_prepared_statement?(binds)
             cursor = @connection.prepare(sql)
           else
             unless @statements.key? sql
@@ -834,22 +844,29 @@ module ActiveRecord
 
       # New method in ActiveRecord 3.1
       def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
-        log(sql, name, binds) do
+        type_casted_binds = binds.map { |col, val|
+          [col, type_cast(val, col)]
+        }
+        log(sql, name, type_casted_binds) do
           returning_id_col = returning_id_index = nil
-          cursor = if @statements.key?(sql)
-            @statements[sql]
+          if without_prepared_statement?(binds)
+            cursor = @connection.prepare(sql)
           else
-            @statements[sql] = @connection.prepare(sql)
-          end
+            unless @statements.key? (sql)
+              @statements[sql] = @connection.prepare(sql)
+            end
 
-          binds.each_with_index do |bind, i|
-            col, val = bind
-            if col.returning_id?
-              returning_id_col = [col]
-              returning_id_index = i + 1
-              cursor.bind_returning_param(returning_id_index, Integer)
-            else
-              cursor.bind_param(i + 1, type_cast(val, col), col)
+            cursor = @statements[sql]
+
+            binds.each_with_index do |bind, i|
+              col, val = bind
+              if col.returning_id?
+                returning_id_col = [col]
+                returning_id_index = i + 1
+                cursor.bind_returning_param(returning_id_index, Integer)
+              else
+                cursor.bind_param(i + 1, type_cast(val, col), col)
+              end
             end
           end
 
@@ -868,7 +885,7 @@ module ActiveRecord
       def exec_update(sql, name, binds)
         log(sql, name, binds) do
           cached = false
-          if binds.empty?
+          if without_prepared_statement?(binds)
             cursor = @connection.prepare(sql)
           else
             cursor = if @statements.key?(sql)
@@ -1260,7 +1277,7 @@ module ActiveRecord
         end.map do |row|
           limit, scale = row['limit'], row['scale']
           if limit || scale
-            row['sql_type'] += "(#{(limit || 38).to_i}" + ((scale = scale.to_i) > 0 ? ",#{scale})" : ")")
+            row['sql_type'] += "(#{(limit || NUMBER_MAX_PRECISION).to_i}" + ((scale = scale.to_i) > 0 ? ",#{scale})" : ")")
           end
 
           if row['sql_type_owner']

data/lib/active_record/connection_adapters/oracle_enhanced_column.rb

@@ -23,9 +23,24 @@ module ActiveRecord
       end
 
       def type_cast(value) #:nodoc:
-        return OracleEnhancedColumn::string_to_raw(value) if type == :raw
-        return guess_date_or_time(value) if type == :datetime && OracleEnhancedAdapter.emulate_dates
-        super
+        case type
+        when :raw
+          OracleEnhancedColumn.string_to_raw(value)
+        when :datetime
+          OracleEnhancedAdapter.emulate_dates ? guess_date_or_time(value) : super
+        when :float
+          !value.nil? ? self.class.value_to_decimal(value) : super
+        else
+          super
+        end
+      end
+
+      def type_cast_code(var_name)
+        type == :float ? "#{self.class.name}.value_to_decimal(#{var_name})" : super
+      end
+
+      def klass
+        type == :float ? BigDecimal : super
       end
 
       def virtual?
@@ -85,12 +100,14 @@ module ActiveRecord
         forced_column_type ||
         case field_type
         when /decimal|numeric|number/i
-          if OracleEnhancedAdapter.emulate_booleans && field_type == 'NUMBER(1)'
+          if OracleEnhancedAdapter.emulate_booleans && field_type.upcase == "NUMBER(1)"
             :boolean
           elsif extract_scale(field_type) == 0 ||
                 # if column name is ID or ends with _ID
                 OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name, table_name)
             :integer
+          elsif field_type.upcase == "NUMBER"
+            OracleEnhancedAdapter.number_datatype_coercion
           else
             :decimal
           end

data/lib/active_record/connection_adapters/oracle_enhanced_column_dumper.rb

@@ -39,15 +39,23 @@ module ActiveRecord #:nodoc:
         return prepare_column_options_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
 
         spec = {}
+
         spec[:name]      = column.name.inspect
         spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
-        spec[:virtual_type] = column.type.inspect if column.virtual? && column.sql_type != 'NUMBER'
         spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit] && column.type != :decimal
         spec[:precision] = column.precision.inspect if !column.precision.nil?
         spec[:scale]     = column.scale.inspect if !column.scale.nil?
         spec[:null]      = 'false' if !column.null
         spec[:as]        = column.virtual_column_data_default if column.virtual?
         spec[:default]   = default_string(column.default) if column.has_default? && !column.virtual?
+
+        if column.virtual?
+          # Supports backwards compatibility with older OracleEnhancedAdapter versions where 'NUMBER' virtual column type is not included in dump
+          if column.sql_type != "NUMBER" || ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.number_datatype_coercion != :decimal
+            spec[:virtual_type] = column.type.inspect
+          end
+        end
+
         spec
       end
 

data/lib/active_record/connection_adapters/oracle_enhanced_dirty.rb

@@ -4,19 +4,19 @@ module ActiveRecord #:nodoc:
 
       module InstanceMethods #:nodoc:
         private
-        
+
         def _field_changed?(attr, old, value)
           if column = column_for_attribute(attr)
             # Added also :decimal type
-            if (column.type == :integer || column.type == :decimal) && column.null && (old.nil? || old == 0) && value.blank?
-              # For nullable integer columns, NULL gets stored in database for blank (i.e. '') values.
+            if ([:integer, :decimal, :float].include? column.type) && column.null && (old.nil? || old == 0) && value.blank?
+              # For nullable integer/decimal/float columns, NULL gets stored in database for blank (i.e. '') values.
               # Hence we don't record it as a change if the value changes from nil to ''.
               # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
               # be typecast back to 0 (''.to_i => 0)
               value = nil
-            # Oracle stores empty string '' as NULL
-            # therefore need to convert empty string value to nil if old value is nil
             elsif column.type == :string && column.null && old.nil?
+              # Oracle stores empty string '' as NULL
+              # therefore need to convert empty string value to nil if old value is nil
               value = nil if value == ''
             elsif old == 0 && value.is_a?(String) && value.present? && non_zero?(value)
               value = nil
@@ -30,8 +30,8 @@ module ActiveRecord #:nodoc:
 
         def non_zero?(value)
           value !~ /\A0+(\.0+)?\z/
-        end 
-        
+        end
+
       end
 
     end

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -27,6 +27,7 @@ begin
       ojdbc_jars.any? do |ojdbc_jar|
         if File.exists?(file_path = File.join(dir, ojdbc_jar))
           puts "WARNING: JDK #{java_version} is not officially supported by #{ojdbc_jar}" if java_version >= '1.8'
+          puts "See http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-faq-090281.html#01_03 for supported versions"
           require file_path
           true
         end

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -98,7 +98,7 @@ module ActiveRecord #:nodoc:
 
     # Creates a record with custom create method
     # and returns its id.
-    def create_record
+    def _create_record
       # check if class has custom create method
       if self.class.custom_create_method
         # run before/after callbacks defined in model
@@ -133,7 +133,7 @@ module ActiveRecord #:nodoc:
 
     # Updates the associated record with custom update method
     # Returns the number of affected rows.
-    def update_record(attribute_names = @attributes.keys)
+    def _update_record(attribute_names = @attributes.keys)
       # check if class has custom update method
       if self.class.custom_update_method
         # run before/after callbacks defined in model
@@ -187,5 +187,8 @@ module ActiveRecord #:nodoc:
     def log_custom_method(*args)
       self.class.connection.send(:log, *args) { yield }
     end
+
+    alias_method :update_record, :_update_record if private_method_defined?(:_update_record)
+    alias_method :create_record, :_create_record if private_method_defined?(:_create_record)
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -686,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_context_index_spec.rb

@@ -381,6 +381,9 @@ describe "OracleEnhancedAdapter context index" do
 
     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
@@ -405,6 +408,7 @@ 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,

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -206,6 +206,7 @@ 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),
@@ -218,17 +219,46 @@ 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
 
-  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
+  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
   end
 
   it "should set NUMBER column type as integer if emulate_integers_by_column_name is true" do
@@ -240,10 +270,24 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type.should == :integer
   end
 
-  it "should set NUMBER column type as decimal if column name does not contain 'id' and emulate_integers_by_column_name is true" do
+  it "should set NUMBER(p,0) column type as integer" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "salary"}
+    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.type.should == :decimal
   end
 
@@ -254,7 +298,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type_cast(1.0).class.should == BigDecimal
   end
 
-  it "should return Fixnum value from NUMBER column if column name contains 'id' and emulate_integers_by_column_name is true" do
+  it "should return Fixnum value from NUMBER column 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 == "job_id"}
@@ -266,7 +310,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
@@ -606,7 +650,6 @@ 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)
@@ -863,7 +906,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
@@ -1301,7 +1344,6 @@ 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)

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -16,6 +16,7 @@ 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
         )
@@ -27,7 +28,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"
@@ -62,6 +63,16 @@ 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
@@ -111,7 +122,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'

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -376,7 +376,7 @@ describe "OracleEnhancedAdapter schema dump" do
             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.virtual :name_ratio, :as=>'(LENGTH(first_name)/LENGTH(last_name))'
             t.column  :full_name_length, :virtual, :as => "length(first_name || ', ' || last_name)", :type => :integer
             t.virtual :field_with_leading_space, :as => "' ' || first_name || ' '", :limit => 300, :type => :string
           end
@@ -402,13 +402,30 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    it 'should dump correctly' do
-      standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
-      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
-      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
-      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
+    context "when number_datatype_coercion is :float" do
+      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
+
+      it 'should dump correctly' do
+        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
+        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*),(\s*)type: :float$/
+        standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
+      end
+    end
+
+    context "when number_datatype_coercion is :decimal" do
+      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
+
+      it 'should dump correctly' do
+        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
+        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/
+        standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
+        standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
+      end
     end
 
     context 'with column cache' do
@@ -454,4 +471,160 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
+  describe "NUMBER columns" do
+    after(:each) do
+      schema_define do
+        drop_table "test_numbers"
+      end
+    end
+
+    let(:value_within_max_precision)    { (10 ** @conn.class::NUMBER_MAX_PRECISION) - 1 }
+    let(:value_exceeding_max_precision) { (10 ** @conn.class::NUMBER_MAX_PRECISION) + 1 }
+
+    context "when using ActiveRecord::Schema.define and ActiveRecord::ConnectionAdapters::TableDefinition#float" do
+      before :each do
+        schema_define do
+          create_table :test_numbers, :force => true do |t|
+            t.float :value
+          end
+        end
+      end
+
+      context "when number_datatype_coercion is :float" do
+        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
+
+        it "should dump correctly" do
+          standard_dump.should =~ /t\.float "value"$/
+        end
+      end
+
+      context "when number_datatype_coercion is :decimal" do
+        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
+
+        it "should dump correctly" do
+          standard_dump.should =~ /t\.decimal "value"$/
+        end
+      end
+    end
+
+    context "when using handwritten 'CREATE_TABLE' SQL" do
+      before :each do
+        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+        @conn = ActiveRecord::Base.connection
+        @conn.execute <<-SQL
+          CREATE TABLE test_numbers (
+            id     NUMBER(#{@conn.class::NUMBER_MAX_PRECISION},0) PRIMARY KEY,
+            value  NUMBER
+          )
+        SQL
+        @conn.execute <<-SQL
+          CREATE SEQUENCE test_numbers_seq  MINVALUE 1
+            INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
+        SQL
+      end
+
+      context "when number_datatype_coercion is :float" do
+        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
+
+        it "should dump correctly" do
+          standard_dump.should =~ /t\.float "value"$/
+        end
+
+        describe "ActiveRecord saving" do
+          before :each do
+            class ::TestNumber < ActiveRecord::Base
+              self.table_name = "test_numbers"
+            end
+          end
+
+          it "should allow saving of values within NUMBER_MAX_PRECISION" do
+            number = TestNumber.new(value: value_within_max_precision)
+            number.save!
+            number.reload
+            number.value.should eq(value_within_max_precision)
+          end
+
+          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
+            number = TestNumber.new(value: value_exceeding_max_precision)
+            number.save!
+            number.reload
+            number.value.should eq(value_exceeding_max_precision)
+          end
+
+          it "should be recreatable from dump and have same properties" do
+            # Simulating db:schema:dump & db:test:load
+            2.times do
+              create_table_dump = standard_dump[/(create_table.+?end)/m]
+
+              schema_define do
+                drop_table "test_numbers"
+              end
+
+              schema_define(&eval("-> * { #{create_table_dump} }"))
+            end
+
+            number = TestNumber.new(value: value_within_max_precision)
+            number.save!
+
+            number2 = TestNumber.new(value: value_exceeding_max_precision)
+            number2.save!
+          end
+        end
+      end
+
+      context "when number_datatype_coercion is :decimal" do
+        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
+
+        it "should dump correctly" do
+          standard_dump.should =~ /t\.decimal "value"$/
+        end
+
+        describe "ActiveRecord saving" do
+          before :each do
+            class ::TestNumber < ActiveRecord::Base
+              self.table_name = "test_numbers"
+            end
+          end
+
+          it "should allow saving of values within NUMBER_MAX_PRECISION" do
+            number = TestNumber.new(value: value_within_max_precision)
+            number.save!
+            number.reload
+            number.value.should eq(value_within_max_precision)
+          end
+
+          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
+            number = TestNumber.new(value: value_exceeding_max_precision)
+            number.save!
+            number.reload
+            number.value.should eq(value_exceeding_max_precision)
+          end
+
+          it "should be recreatable from dump and have same properties" do
+            # Simulating db:schema:dump & db:test:load
+            2.times do |i|
+              create_table_dump = standard_dump[/(create_table.+?end)/m]
+
+              schema_define do
+                drop_table "test_numbers"
+              end
+
+              schema_define(&eval("-> * { #{create_table_dump} }"))
+            end
+
+            number = TestNumber.new(value: value_within_max_precision)
+            number.save!
+
+            # Raises 'ORA-01438' as :value column type isn't FLOAT'ish
+            number2 = TestNumber.new(value: value_exceeding_max_precision)
+            lambda do
+              number2.save!
+            end.should raise_error() { |e| e.message.should =~ /ORA-01438/ }
+          end
+        end
+      end # context (:decimal)
+
+    end # context (handwritten)
+  end # describe (NUMBER columns)
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler