activerecord 4.2.1 → 4.2.7.1

data/lib/active_record/transactions.rb

@@ -328,9 +328,13 @@ module ActiveRecord
     # Add the record to the current transaction so that the +after_rollback+ and +after_commit+ callbacks
     # can be called.
     def add_to_transaction
-      if self.class.connection.add_transaction_record(self)
-        remember_transaction_record_state
+      if has_transactional_callbacks?
+        self.class.connection.add_transaction_record(self)
+      else
+        sync_with_transaction_state
+        set_transaction_state(self.class.connection.transaction_state)
       end
+      remember_transaction_record_state
     end
 
     # Executes +method+ within a transaction and captures its return value as a
@@ -353,6 +357,10 @@ module ActiveRecord
         raise ActiveRecord::Rollback unless status
       end
       status
+    ensure
+      if @transaction_state && @transaction_state.committed?
+        clear_transaction_record_state
+      end
     end
 
     protected
@@ -385,10 +393,14 @@ module ActiveRecord
         transaction_level = (@_start_transaction_state[:level] || 0) - 1
         if transaction_level < 1 || force
           restore_state = @_start_transaction_state
-          thaw unless restore_state[:frozen?]
+          thaw
           @new_record = restore_state[:new_record]
           @destroyed  = restore_state[:destroyed]
-          write_attribute(self.class.primary_key, restore_state[:id]) if self.class.primary_key
+          pk = self.class.primary_key
+          if pk && read_attribute(pk) != restore_state[:id]
+            write_attribute(pk, restore_state[:id])
+          end
+          freeze if restore_state[:frozen?]
         end
       end
     end

data/lib/active_record/type/boolean.rb

@@ -16,6 +16,7 @@ module ActiveRecord
           if !ConnectionAdapters::Column::FALSE_VALUES.include?(value)
             ActiveSupport::Deprecation.warn(<<-MSG.squish)
               You attempted to assign a value which is not explicitly `true` or `false`
+              (#{value.inspect})
               to a boolean column. Currently this value casts to `false`. This will
               change to match Ruby's semantics, and will cast to `true` in Rails 5.
               If you would like to maintain the current behavior, you should

data/lib/active_record/type/date.rb

@@ -9,6 +9,10 @@ module ActiveRecord
         ::Date
       end
 
+      def type_cast_for_database(value)
+        type_cast(value)
+      end
+
       def type_cast_for_schema(value)
         "'#{value.to_s(:db)}'"
       end

data/lib/active_record/type/decimal.rb

@@ -14,7 +14,7 @@ module ActiveRecord
       private
 
       def cast_value(value)
-        case value
+        casted_value = case value
         when ::Float
           convert_float_to_big_decimal(value)
         when ::Numeric, ::String
@@ -26,11 +26,13 @@ module ActiveRecord
             cast_value(value.to_s)
           end
         end
+
+        apply_scale(casted_value)
       end
 
       def convert_float_to_big_decimal(value)
         if precision
-          BigDecimal(value, float_precision)
+          BigDecimal(apply_scale(value), float_precision)
         else
           value.to_d
         end
@@ -43,6 +45,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/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, type_cast_for_database(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/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)

data/lib/active_record.rb

@@ -43,6 +43,7 @@ module ActiveRecord
   autoload :Explain
   autoload :Inheritance
   autoload :Integration
+  autoload :LegacyYamlAdapter
   autoload :Migration
   autoload :Migrator, 'active_record/migration'
   autoload :ModelSchema
@@ -52,6 +53,7 @@ module ActiveRecord
   autoload :QueryCache
   autoload :Querying
   autoload :ReadonlyAttributes
+  autoload :RecordInvalid, 'active_record/validations'
   autoload :Reflection
   autoload :RuntimeRegistry
   autoload :Sanitization

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.7.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2016-08-10 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.1
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -194,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
@@ -303,8 +304,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
+has_rdoc: