activerecord 4.2.0.beta1 → 4.2.0.beta2

data/lib/active_record/tasks/database_tasks.rb

@@ -131,10 +131,12 @@ module ActiveRecord
         verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         scope   = ENV['SCOPE']
-        Migration.verbose = verbose
+        verbose_was, Migration.verbose = Migration.verbose, verbose
         Migrator.migrate(Migrator.migrations_paths, version) do |migration|
           scope.blank? || scope == migration.scope
         end
+      ensure
+        Migration.verbose = verbose_was
       end
 
       def charset_current(environment = env)
@@ -169,6 +171,7 @@ module ActiveRecord
         each_current_configuration(environment) { |configuration|
           purge configuration
         }
+        ActiveRecord::Base.establish_connection(environment.to_sym)
       end
 
       def structure_dump(*arguments)
@@ -184,10 +187,10 @@ module ActiveRecord
       end
 
       def load_schema(format = ActiveRecord::Base.schema_format, file = nil)
-        ActiveSupport::Deprecation.warn(<<-MESSAGE.strip_heredoc)
-          This method will act on a specific connection in the future.
-          To act on the current connection, use `load_schema_current` instead.
-        MESSAGE
+        ActiveSupport::Deprecation.warn \
+          "This method will act on a specific connection in the future. " \
+          "To act on the current connection, use `load_schema_current` instead."
+
         load_schema_current(format, file)
       end
 
@@ -215,6 +218,7 @@ module ActiveRecord
         each_current_configuration(environment) { |configuration|
           load_schema_for configuration, format, file
         }
+        ActiveRecord::Base.establish_connection(environment.to_sym)
       end
 
       def check_schema_file(filename)

data/lib/active_record/transactions.rb

@@ -3,15 +3,15 @@ module ActiveRecord
   module Transactions
     extend ActiveSupport::Concern
     ACTIONS = [:create, :destroy, :update]
-    CALLBACK_WARN_MESSAGE = <<-EOF
-Currently, Active Record will rescue any errors raised within
-after_rollback/after_commit callbacks and print them to the logs. In the next
-version, these errors will no longer be rescued. Instead, they will simply
-bubble just like other Active Record callbacks.
-
-You can opt into the new behavior and remove this warning by setting
-config.active_record.raise_in_transactional_callbacks to true.
-EOF
+    CALLBACK_WARN_MESSAGE = "Currently, Active Record suppresses errors raised " \
+      "within `after_rollback`/`after_commit` callbacks and only print them to " \
+      "the logs. In the next version, these errors will no longer be suppressed. " \
+      "Instead, the errors will propagate normally just like in other Active " \
+      "Record callbacks.\n" \
+      "\n" \
+      "You can opt into the new behavior and remove this warning by setting:\n" \
+      "\n" \
+      "  config.active_record.raise_in_transactional_callbacks = true"
 
     included do
       define_callbacks :commit, :rollback,

data/lib/active_record/type.rb

@@ -1,3 +1,4 @@
+require 'active_record/type/decorator'
 require 'active_record/type/mutable'
 require 'active_record/type/numeric'
 require 'active_record/type/time_value'

data/lib/active_record/type/binary.rb

@@ -22,6 +22,11 @@ module ActiveRecord
         Data.new(super)
       end
 
+      def changed_in_place?(raw_old_value, value)
+        old_value = type_cast_from_database(raw_old_value)
+        old_value != value
+      end
+
       class Data # :nodoc:
         def initialize(value)
           @value = value.to_s
@@ -30,10 +35,15 @@ module ActiveRecord
         def to_s
           @value
         end
+        alias_method :to_str, :to_s
 
         def hex
           @value.unpack('H*')[0]
         end
+
+        def ==(other)
+          other == to_s || super
+        end
       end
     end
   end

data/lib/active_record/type/decorator.rb

@@ -0,0 +1,14 @@
+module ActiveRecord
+  module Type
+    module Decorator # :nodoc:
+      def init_with(coder)
+        @subtype = coder['subtype']
+        __setobj__(@subtype)
+      end
+
+      def encode_with(coder)
+        coder['subtype'] = __getobj__
+      end
+    end
+  end
+end

data/lib/active_record/type/serialized.rb

@@ -2,6 +2,7 @@ module ActiveRecord
   module Type
     class Serialized < SimpleDelegator # :nodoc:
       include Mutable
+      include Decorator
 
       attr_reader :subtype, :coder
 
@@ -26,19 +27,23 @@ module ActiveRecord
         end
       end
 
+      def changed_in_place?(raw_old_value, value)
+        return false if value.nil?
+        subtype.changed_in_place?(raw_old_value, coder.dump(value))
+      end
+
       def accessor
         ActiveRecord::Store::IndifferentHashAccessor
       end
 
       def init_with(coder)
-        @subtype = coder['subtype']
         @coder = coder['coder']
-        __setobj__(@subtype)
+        super
       end
 
       def encode_with(coder)
-        coder['subtype'] = @subtype
         coder['coder'] = @coder
+        super
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta1
+  version: 4.2.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-26 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.beta1
+        version: 4.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +258,7 @@ files:
 - lib/active_record/type/date_time.rb
 - lib/active_record/type/decimal.rb
 - lib/active_record/type/decimal_without_scale.rb
+- lib/active_record/type/decorator.rb
 - lib/active_record/type/float.rb
 - lib/active_record/type/hash_lookup_type_map.rb
 - lib/active_record/type/integer.rb