activerecord 4.2.0 → 4.2.11

data/lib/active_record/type/decimal.rb

@@ -14,11 +14,17 @@ module ActiveRecord
       private
 
       def cast_value(value)
-        case value
+        casted_value = case value
         when ::Float
-          BigDecimal(value, float_precision)
-        when ::Numeric, ::String
+          convert_float_to_big_decimal(value)
+        when ::Numeric
           BigDecimal(value, precision.to_i)
+        when ::String
+          begin
+            value.to_d
+          rescue ArgumentError
+            BigDecimal(0)
+          end
         else
           if value.respond_to?(:to_d)
             value.to_d
@@ -26,6 +32,16 @@ module ActiveRecord
             cast_value(value.to_s)
           end
         end
+
+        apply_scale(casted_value)
+      end
+
+      def convert_float_to_big_decimal(value)
+        if precision
+          BigDecimal(apply_scale(value), float_precision)
+        else
+          value.to_d
+        end
       end
 
       def float_precision
@@ -35,6 +51,14 @@ module ActiveRecord
           precision.to_i
         end
       end
+
+      def apply_scale(value)
+        if scale
+          value.round(scale)
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/active_record/type/hash_lookup_type_map.rb

@@ -1,12 +1,18 @@
 module ActiveRecord
   module Type
     class HashLookupTypeMap < TypeMap # :nodoc:
-      delegate :key?, to: :@mapping
-
       def alias_type(type, alias_type)
         register_type(type) { |_, *args| lookup(alias_type, *args) }
       end
 
+      def key?(key)
+        @mapping.key?(key)
+      end
+
+      def keys
+        @mapping.keys
+      end
+
       private
 
       def perform_fetch(type, *args, &block)

data/lib/active_record/type/integer.rb

@@ -12,13 +12,19 @@ module ActiveRecord
         :integer
       end
 
-      alias type_cast_for_database type_cast
-
       def type_cast_from_database(value)
         return if value.nil?
         value.to_i
       end
 
+      def type_cast_for_database(value)
+        result = type_cast(value)
+        if result
+          ensure_in_range(result)
+        end
+        result
+      end
+
       protected
 
       attr_reader :range
@@ -30,9 +36,7 @@ module ActiveRecord
         when true then 1
         when false then 0
         else
-          result = value.to_i rescue nil
-          ensure_in_range(result) if result
-          result
+          value.to_i rescue nil
         end
       end
 

data/lib/active_record/type/numeric.rb

@@ -29,7 +29,7 @@ module ActiveRecord
         # 'wibble'.to_i will give zero, we want to make sure
         # that we aren't marking int zero to string zero as
         # changed.
-        value.to_s !~ /\A\d+\.?\d*\z/
+        value.to_s !~ /\A-?\d+\.?\d*\z/
       end
     end
   end

data/lib/active_record/type/serialized.rb

@@ -27,9 +27,15 @@ module ActiveRecord
         end
       end
 
+      def inspect
+        Kernel.instance_method(:inspect).bind(self).call
+      end
+
       def changed_in_place?(raw_old_value, value)
         return false if value.nil?
-        subtype.changed_in_place?(raw_old_value, coder.dump(value))
+        raw_new_value = type_cast_for_database(value)
+        raw_old_value.nil? != raw_new_value.nil? ||
+          subtype.changed_in_place?(raw_old_value, raw_new_value)
       end
 
       def accessor

data/lib/active_record/type/string.rb

@@ -21,6 +21,10 @@ module ActiveRecord
         end
       end
 
+      def text?
+        true
+      end
+
       private
 
       def cast_value(value)

data/lib/active_record/type/value.rb

@@ -50,6 +50,10 @@ module ActiveRecord
 
       # These predicates are not documented, as I need to look further into
       # their use, and see if they can be removed entirely.
+      def text? # :nodoc:
+        false
+      end
+
       def number? # :nodoc:
         false
       end
@@ -82,6 +86,11 @@ module ActiveRecord
           scale == other.scale &&
           limit == other.limit
       end
+      alias eql? ==
+
+      def hash
+        [self.class, precision, scale, limit].hash
+      end
 
       private
 

data/lib/active_record/validations/uniqueness.rb

@@ -15,11 +15,21 @@ module ActiveRecord
         table = finder_class.arel_table
         value = map_enum_attribute(finder_class, attribute, value)
 
-        relation = build_relation(finder_class, table, attribute, value)
-        relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-        relation = scope_relation(record, table, relation)
-        relation = finder_class.unscoped.where(relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
+        begin
+          relation = build_relation(finder_class, table, attribute, value)
+          if record.persisted?
+            if finder_class.primary_key
+              relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id))
+            else
+              raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
+            end
+          end
+          relation = scope_relation(record, table, relation)
+          relation = finder_class.unscoped.where(relation)
+          relation = relation.merge(options[:conditions]) if options[:conditions]
+        rescue RangeError
+          relation = finder_class.none
+        end
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
@@ -65,7 +75,7 @@ module ActiveRecord
           value = value.to_s[0, column.limit]
         end
 
-        if !options[:case_sensitive] && value.is_a?(String)
+        if !options[:case_sensitive] && value && column.text?
           # will use SQL LOWER function before comparison, unless it detects a case insensitive collation
           klass.connection.case_insensitive_comparison(table, attribute, column, value)
         else

data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb

@@ -14,9 +14,6 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     end
 <% attributes_with_index.each do |attribute| -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
-<% end -%>
-<% attributes.select(&:reference?).reject(&:polymorphic?).each do |attribute| -%>
-    add_foreign_key :<%= table_name %>, :<%= attribute.name.pluralize %>
 <% end -%>
   end
 end

data/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -4,9 +4,6 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <% attributes.each do |attribute| -%>
   <%- if attribute.reference? -%>
     add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
-    <%- unless attribute.polymorphic? -%>
-    add_foreign_key :<%= table_name %>, :<%= attribute.name.pluralize %>
-    <%- end -%>
   <%- else -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
@@ -29,9 +26,6 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <%- if migration_action -%>
   <%- if attribute.reference? -%>
     remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
-    <%- unless attribute.polymorphic? -%>
-    remove_foreign_key :<%= table_name %>, :<%= attribute.name.pluralize %>
-    <%- end -%>
   <%- else -%>
     <%- if attribute.has_index? -%>
     remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.11
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,7 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.rb
+- lib/active_record/associations/foreign_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
 - lib/active_record/associations/has_one_association.rb
@@ -193,6 +194,7 @@ files:
 - lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/integration.rb
+- lib/active_record/legacy_yaml_adapter.rb
 - lib/active_record/locale/en.yml
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
@@ -302,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).