activerecord 4.1.5 → 4.1.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2fb22442debba985a6376c3c786841597a57c4
-  data.tar.gz: 538fd25c6b66cb8c30f8a730afb9737b4718d1ce
+  metadata.gz: 02fdf8941d42f0f2f3283a00dd3616750277b096
+  data.tar.gz: 11006bed30d01efe124ace3e324bbfa3c819f069
 SHA512:
-  metadata.gz: 1279a4c8bf786d49638d67b565995258eedb09161090380fe10eacb620810cf84eeb477129c15b9ba673c4784dbbffe28533530fecfddde5be404003b987b14d
-  data.tar.gz: f79932b94e2dad4111460f7db455cc78e05ae8f886b8bca26a4ad5d369d13a8917b4167a2091611519ae55699afff32e9de5fb775a472b379b5661a1c96d59f5
+  metadata.gz: de48b07e300b9b72eb5cb34cb2a6a12b3bb74764f9dd7fa4cd4ef89c51059da2781d3bba28202c5eb1d1418abde8a33a9ebe337cc6fc168d965a5439ae3b176c
+  data.tar.gz: 596770b48517454ce12958f5d9e8f3af669f0473c935c6c04ffa5cbe6dbc526496733fb56f6ae65671258b973254dea9e7cb6943606f4a8829ffbfcaceaf1357

data/CHANGELOG.md

@@ -1,3 +1,164 @@
+## Rails 4.1.6 (August 19, 2014) ##
+
+*   Fixed an issue where custom accessor methods (such as those generated by
+    `enum`) with the same name as a global method are incorrectly overridden
+    when subclassing.
+
+    Fixes #16288.
+
+*   Baseclass becomes! subclass.
+
+    Before this change, a record which changed its STI type, could not be found when updated.
+    Setting update_record to the base class, ensures the record can be found.
+
+    Fixes #14785.
+
+    *Matthew Draper*, *Earl St Sauver*, *Edo Balvers*
+
+*   Fix regression on after_commit that didnt fire when having nested transactions.
+
+    Fixes #16425.
+
+    *arthurnn*
+
+*   Define `id_was` to get the previous value of the primary key.
+
+    Currently when we call id_was and we have a custom primary key name
+    Active Record will return the current value of the primary key. This
+    make impossible to correctly do an update operation if you change the
+    id.
+
+    Fixes #16413.
+
+    *Rafael Mendonça França*
+
+*   Fix the schema dump generated for tables without constraints and with
+    primary key with default value of custom PostgreSQL function result.
+
+    Fixes #16111.
+
+    *Andrey Novikov*
+
+*   Restore 4.0 behavior for using serialize attributes with `JSON` as coder.
+
+    With 4.1.x, `serialize` started returning a string when `JSON` was passed as
+    the second attribute. It will now return a hash as per previous versions.
+
+    Example:
+
+        class Post < ActiveRecord::Base
+          serialize :comment, JSON
+        end
+
+        class Comment
+          include ActiveModel::Model
+          attr_accessor :category, :text
+        end
+
+        post = Post.create!
+        post.comment = Comment.new(category: "Animals", text: "This is a comment about squirrels.")
+        post.save!
+
+        # 4.0
+        post.comment # => {"category"=>"Animals", "text"=>"This is a comment about squirrels."}
+
+        # 4.1 before
+        post.comment # => "#<Comment:0x007f80ab48ff98>"
+
+        # 4.1 after
+        post.comment # => {"category"=>"Animals", "text"=>"This is a comment about squirrels."}
+
+    When using `JSON` as the coder in `serialize`, Active Record will use the
+    new `ActiveRecord::Coders::JSON` coder which delegates its `dump/load` to
+    `ActiveSupport::JSON.encode/decode`. This ensures special objects are dumped
+    correctly using the `#as_json` hook.
+
+    To keep the previous behaviour, supply a custom coder instead
+    ([example](https://gist.github.com/jenncoop/8c4142bbe59da77daa63)).
+
+    Fixes #15594.
+
+    *Jenn Cooper*
+
+*   Fixed error in `reset_counters` when associations have `select` scope.
+    (Call to `count` generates invalid SQL.)
+
+    *Cade Truitt*
+
+*   After a successful `reload`, `new_record?` is always false.
+
+    Fixes #12101.
+
+    *Matthew Draper*
+
+*   `has_many :through` associations will no longer save the through record
+    twice when added in an `after_create` callback defined before the
+    associations.
+
+    *Sean Griffin*
+
+*   Correctly extract IPv6 addresses from `DATABASE_URI`: the square brackets
+    are part of the URI structure, not the actual host.
+
+    Fixes #15705.
+
+    *Andy Bakun*, *Aaron Stone*
+
+*   Don't error when quoting user defined types in PostgreSQL.
+
+    Fixes #15697.
+
+    *Sean Griffin*
+
+*   Ensure both parent IDs are set on join records when both sides of a
+    through association are new.
+
+    *Sean Griffin*
+
+*   Pluck now works when selecting columns from different tables with the same
+    name.
+
+    Fixes #15649.
+
+    *Sean Griffin*
+
+*   `ActiveRecord::FinderMethods.find` with block can handle proc parameter as
+    `Enumerable#find` does.
+
+    Fixes #15382.
+
+    *James Yang*
+
+*   `ActiveRecord::SchemaMigration` has no primary key regardless of the
+    `primary_key_prefix_type` configuration.
+
+    Fixes #15051.
+
+    *JoseLuis Torres*, *Yves Senn*
+
+*   `rake db:migrate:status` works with legacy migration numbers like `00018_xyz.rb`.
+
+    Fixes #15538.
+
+    *Yves Senn*
+
+*   Fixed `columns_for_distinct` of postgresql adapter to work correctly
+    with orders without sort direction modifiers.
+
+    *Nikolay Kondratyev*
+
+*   Keep PostgreSQL `hstore` and `json` attributes as `Hash` in `@attributes`.
+    Fixes duplication in combination with `store_accessor`.
+
+    Fixes #15369.
+
+    *Yves Senn*
+
+*   `rake railties:install:migrations` respects the order of railties.
+
+    *Arun Agrawal*
+
+
 ## Rails 4.1.5 (August 18, 2014) ##
 
 *   No changes.

data/lib/active_record.rb

@@ -95,6 +95,7 @@ module ActiveRecord
 
   module Coders
     autoload :YAMLColumn, 'active_record/coders/yaml_column'
+    autoload :JSON, 'active_record/coders/json'
   end
 
   module AttributeMethods

data/lib/active_record/associations.rb

@@ -1422,7 +1422,7 @@ module ActiveRecord
       #   belongs_to :firm, foreign_key: "client_of"
       #   belongs_to :person, primary_key: "name", foreign_key: "person_name"
       #   belongs_to :author, class_name: "Person", foreign_key: "author_id"
-      #   belongs_to :valid_coupon, ->(o) { where "discounts > #{o.payments_count}" },
+      #   belongs_to :valid_coupon, ->(o) { where "discounts > ?", o.payments_count },
       #                             class_name: "Coupon", foreign_key: "coupon_id"
       #   belongs_to :attachable, polymorphic: true
       #   belongs_to :project, readonly: true
@@ -1588,7 +1588,7 @@ module ActiveRecord
 
         Builder::HasMany.define_callbacks self, middle_reflection
         Reflection.add_reflection self, middle_reflection.name, middle_reflection
-        middle_reflection.parent_reflection = [name, habtm_reflection]
+        middle_reflection.parent_reflection = [name.to_sym, habtm_reflection]
 
         include Module.new {
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -1609,7 +1609,7 @@ module ActiveRecord
         end
 
         has_many name, scope, hm_options, &extension
-        self._reflections[name].parent_reflection = [name, habtm_reflection]
+        self._reflections[name.to_sym].parent_reflection = [name.to_sym, habtm_reflection]
       end
     end
   end

data/lib/active_record/associations/alias_tracker.rb

@@ -32,8 +32,18 @@ module ActiveRecord
             join.left.downcase.scan(
               /join(?:\s+\w+)?\s+(\S+\s+)?#{quoted_name}\son/
             ).size
-          else
+          elsif join.respond_to? :left
             join.left.table_name == name ? 1 : 0
+          else
+            # this branch is reached by two tests:
+            #
+            # activerecord/test/cases/associations/cascaded_eager_loading_test.rb:37
+            #   with :posts
+            #
+            # activerecord/test/cases/associations/eager_test.rb:1133
+            #   with :comments
+            #
+            0
           end
         end
 

data/lib/active_record/associations/builder/has_and_belongs_to_many.rb

@@ -72,6 +72,15 @@ module ActiveRecord::Associations::Builder
           self.right_reflection = _reflect_on_association(rhs_name)
         end
 
+        def hash
+          object_id.hash
+        end
+
+        def ==(other)
+          equal?(other)
+        end
+        alias :eql? :==
+
       }
 
       join_model.name                = "HABTM_#{association_name.to_s.camelize}"

data/lib/active_record/associations/has_many_through_association.rb

@@ -187,7 +187,11 @@ module ActiveRecord
         def through_records_for(record)
           attributes = construct_join_attributes(record)
           candidates = Array.wrap(through_association.target)
-          candidates.find_all { |c| c.attributes.slice(*attributes.keys) == attributes }
+          candidates.find_all do |c|
+            attributes.all? do |key, value|
+              c.public_send(key) == value
+            end
+          end
         end
 
         def delete_through_records(records)

data/lib/active_record/associations/through_association.rb

@@ -41,12 +41,16 @@ module ActiveRecord
         def construct_join_attributes(*records)
           ensure_mutable
 
-          join_attributes = {
-            source_reflection.foreign_key =>
-              records.map { |record|
-                record.send(source_reflection.association_primary_key(reflection.klass))
-              }
-          }
+          if source_reflection.association_primary_key(reflection.klass) == reflection.klass.primary_key
+            join_attributes = { source_reflection.name => records }
+          else
+            join_attributes = {
+              source_reflection.foreign_key =>
+                records.map { |record|
+                  record.send(source_reflection.association_primary_key(reflection.klass))
+                }
+            }
+          end
 
           if options[:source_type]
             join_attributes[source_reflection.foreign_type] =

data/lib/active_record/attribute_methods.rb

@@ -51,6 +51,8 @@ module ActiveRecord
       def method_body; raise NotImplementedError; end
     end
 
+    class GeneratedAttributeMethods < Module; end # :nodoc:
+
     module ClassMethods
       def inherited(child_class) #:nodoc:
         child_class.initialize_generated_modules
@@ -58,7 +60,7 @@ module ActiveRecord
       end
 
       def initialize_generated_modules # :nodoc:
-        @generated_attribute_methods = Module.new { extend Mutex_m }
+        @generated_attribute_methods = GeneratedAttributeMethods.new { extend Mutex_m }
         @attribute_methods_generated = false
         include @generated_attribute_methods
       end
@@ -107,10 +109,11 @@ module ActiveRecord
         if superclass == Base
           super
         else
-          # If B < A and A defines its own attribute method, then we don't want to overwrite that.
-          defined = method_defined_within?(method_name, superclass, superclass.generated_attribute_methods)
-          base_defined = Base.method_defined?(method_name) || Base.private_method_defined?(method_name)
-          defined && !base_defined || super
+          # If ThisClass < ... < SomeSuperClass < ... < Base and SomeSuperClass
+          # defines its own attribute method, then we don't want to overwrite that.
+          defined = method_defined_within?(method_name, superclass, Base) &&
+            ! superclass.instance_method(method_name).owner.is_a?(GeneratedAttributeMethods)
+          defined || super
         end
       end
 

data/lib/active_record/attribute_methods/primary_key.rb

@@ -15,6 +15,7 @@ module ActiveRecord
 
       # Returns the primary key value.
       def id
+        return unless self.class.primary_key
         sync_with_transaction_state
         read_attribute(self.class.primary_key)
       end
@@ -37,6 +38,12 @@ module ActiveRecord
         read_attribute_before_type_cast(self.class.primary_key)
       end
 
+      # Returns the primary key previous value.
+      def id_was
+        sync_with_transaction_state
+        attribute_was(self.class.primary_key)
+      end
+
       protected
 
       def attribute_method?(attr_name)
@@ -52,7 +59,7 @@ module ActiveRecord
           end
         end
 
-        ID_ATTRIBUTE_METHODS = %w(id id= id? id_before_type_cast).to_set
+        ID_ATTRIBUTE_METHODS = %w(id id= id? id_before_type_cast id_was).to_set
 
         def dangerous_attribute_method?(method_name)
           super && !ID_ATTRIBUTE_METHODS.include?(method_name)

data/lib/active_record/attribute_methods/serialization.rb

@@ -52,7 +52,12 @@ module ActiveRecord
         def serialize(attr_name, class_name_or_coder = Object)
           include Behavior
 
-          coder = if [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
+          # When ::JSON is used, force it to go through the Active Support JSON encoder
+          # to ensure special objects (e.g. Active Record models) are dumped correctly
+          # using the #as_json hook.
+          coder = if class_name_or_coder == ::JSON
+                    Coders::JSON
+                  elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
                     class_name_or_coder
                   else
                     Coders::YAMLColumn.new(class_name_or_coder)

data/lib/active_record/autosave_association.rb

@@ -363,6 +363,7 @@ module ActiveRecord
 
               raise ActiveRecord::Rollback unless saved
             end
+            @new_record_before_save = false
           end
 
           # reconstruct the scope now that we know the owner's id

data/lib/active_record/coders/json.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module Coders # :nodoc:
+    class JSON # :nodoc:
+      def self.dump(obj)
+        ActiveSupport::JSON.encode(obj)
+      end
+
+      def self.load(json)
+        ActiveSupport::JSON.decode(json) unless json.nil?
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/abstract/connection_pool.rb

@@ -236,8 +236,8 @@ module ActiveRecord
 
         @spec = spec
 
-        @checkout_timeout = spec.config[:checkout_timeout] || 5
-        @dead_connection_timeout = spec.config[:dead_connection_timeout] || 5
+        @checkout_timeout = (spec.config[:checkout_timeout] && spec.config[:checkout_timeout].to_f) || 5
+        @dead_connection_timeout = (spec.config[:dead_connection_timeout] && spec.config[:dead_connection_timeout].to_f) || 5
         @reaper  = Reaper.new self, spec.config[:reaping_frequency]
         @reaper.run
 

data/lib/active_record/connection_adapters/abstract/transaction.rb

@@ -201,6 +201,7 @@ module ActiveRecord
         @state.set_state(:committed)
         @state.parent = parent.state
         connection.release_savepoint
+        records.each { |r| parent.add_record(r) }
       end
     end
   end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -753,8 +753,8 @@ module ActiveRecord
         # Make MySQL reject illegal values rather than truncating or blanking them, see
         # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
         # If the user has provided another value for sql_mode, don't replace it.
-        if strict_mode? && !variables.has_key?('sql_mode')
-          variables['sql_mode'] = 'STRICT_ALL_TABLES'
+        unless variables.has_key?('sql_mode')
+          variables['sql_mode'] = strict_mode? ? 'STRICT_ALL_TABLES' : ''
         end
 
         # NAMES does not have an equals sign, see

data/lib/active_record/connection_adapters/connection_specification.rb

@@ -86,7 +86,7 @@ module ActiveRecord
               "password" => uri.password,
               "port"     => uri.port,
               "database" => database_from_path,
-              "host"     => uri.host })
+              "host"     => uri.hostname })
           end
         end
 

data/lib/active_record/connection_adapters/postgresql/oid.rb

@@ -231,7 +231,10 @@ module ActiveRecord
 
         class Hstore < Type
           def type_cast_for_write(value)
-            ConnectionAdapters::PostgreSQLColumn.hstore_to_string value
+            # roundtrip to ensure uniform uniform types
+            # TODO: This is not an efficient solution.
+            stringified = ConnectionAdapters::PostgreSQLColumn.hstore_to_string(value)
+            type_cast(stringified)
           end
 
           def type_cast(value)
@@ -255,7 +258,10 @@ module ActiveRecord
 
         class Json < Type
           def type_cast_for_write(value)
-            ConnectionAdapters::PostgreSQLColumn.json_to_string value
+            # roundtrip to ensure uniform uniform types
+            # TODO: This is not an efficient solution.
+            stringified = ConnectionAdapters::PostgreSQLColumn.json_to_string(value)
+            type_cast(stringified)
           end
 
           def type_cast(value)

data/lib/active_record/connection_adapters/postgresql/quoting.rb

@@ -16,7 +16,7 @@ module ActiveRecord
 
         # Quotes PostgreSQL-specific data types for SQL input.
         def quote(value, column = nil) #:nodoc:
-          return super unless column
+          return super unless column && column.type
 
           sql_type = type_to_sql(column.type, column.limit, column.precision, column.scale)
 

data/lib/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -493,7 +493,7 @@ module ActiveRecord
               # Convert Arel node to string
               s = s.to_sql unless s.is_a?(String)
               # Remove any ASC/DESC modifiers
-              s.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\s*)?/i, '')
+              s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
           [super, *order_columns].join(', ')

data/lib/active_record/counter_cache.rb

@@ -33,7 +33,7 @@ module ActiveRecord
           counter_name = reflection.counter_cache_column
 
           stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({
-            arel_table[counter_name] => object.send(association).count
+            arel_table[counter_name] => object.send(association).count(:all)
           }, primary_key)
           connection.update stmt
         end

data/lib/active_record/enum.rb

@@ -67,12 +67,12 @@ module ActiveRecord
   #
   # Where conditions on an enum attribute must use the ordinal value of an enum.
   module Enum
-    def self.extended(base)
+    def self.extended(base) # :nodoc:
       base.class_attribute(:defined_enums)
       base.defined_enums = {}
     end
 
-    def inherited(base)
+    def inherited(base) # :nodoc:
       base.defined_enums = defined_enums.deep_dup
       super
     end

data/lib/active_record/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveRecord
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 5
-    PRE   = nil
+    TINY  = 6
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/migration.rb

@@ -711,7 +711,7 @@ module ActiveRecord
       if ActiveRecord::Base.timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
       else
-        "%.3d" % number
+        SchemaMigration.normalize_migration_number(number)
       end
     end
 
@@ -826,21 +826,20 @@ module ActiveRecord
         SchemaMigration.table_name
       end
 
-      def get_all_versions
-        SchemaMigration.all.map { |x| x.version.to_i }.sort
+      def get_all_versions(connection = Base.connection)
+        if connection.table_exists?(schema_migrations_table_name)
+          SchemaMigration.all.map { |x| x.version.to_i }.sort
+        else
+          []
+        end
       end
 
       def current_version(connection = Base.connection)
-        sm_table = schema_migrations_table_name
-        if connection.table_exists?(sm_table)
-          get_all_versions.max || 0
-        else
-          0
-        end
+        get_all_versions(connection).max || 0
       end
 
       def needs_migration?(connection = Base.connection)
-        current_version(connection) < last_version
+        (migrations(migrations_paths).collect(&:version) - get_all_versions(connection)).size > 0
       end
 
       def last_version

data/lib/active_record/persistence.rb

@@ -399,6 +399,7 @@ module ActiveRecord
       @column_types           = self.class.column_types
       @column_types_override  = fresh_object.instance_variable_get('@column_types_override')
       @attributes_cache       = {}
+      @new_record             = false
       self
     end
 

data/lib/active_record/railties/databases.rake

@@ -87,14 +87,15 @@ db_namespace = namespace :db do
         next  # means "return" for rake task
       end
       db_list = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
-      db_list.map! { |version| "%.3d" % version }
+      db_list.map! { |version| ActiveRecord::SchemaMigration.normalize_migration_number(version) }
       file_list = []
       ActiveRecord::Migrator.migrations_paths.each do |path|
         Dir.foreach(path) do |file|
           # match "20091231235959_some_name.rb" and "001_some_name.rb" pattern
           if match_data = /^(\d{3,})_(.+)\.rb$/.match(file)
-            status = db_list.delete(match_data[1]) ? 'up' : 'down'
-            file_list << [status, match_data[1], match_data[2].humanize]
+            version = ActiveRecord::SchemaMigration.normalize_migration_number(match_data[1])
+            status = db_list.delete(version) ? 'up' : 'down'
+            file_list << [status, version, match_data[2].humanize]
           end
         end
       end
@@ -367,7 +368,7 @@ namespace :railties do
     task :migrations => :'db:load_config' do
       to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
       railties = {}
-      Rails.application.railties.each do |railtie|
+      Rails.application.migration_railties.each do |railtie|
         next unless to_load == :all || to_load.include?(railtie.railtie_name)
 
         if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)

data/lib/active_record/reflection.rb

@@ -22,11 +22,11 @@ module ActiveRecord
     end
 
     def self.add_reflection(ar, name, reflection)
-      ar._reflections = ar._reflections.merge(name => reflection)
+      ar._reflections = ar._reflections.merge(name.to_sym => reflection)
     end
 
     def self.add_aggregate_reflection(ar, name, reflection)
-      ar.aggregate_reflections = ar.aggregate_reflections.merge(name => reflection)
+      ar.aggregate_reflections = ar.aggregate_reflections.merge(name.to_sym => reflection)
     end
 
     # \Reflection enables to interrogate Active Record classes and objects
@@ -48,7 +48,7 @@ module ActiveRecord
       #   Account.reflect_on_aggregation(:balance) # => the balance AggregateReflection
       #
       def reflect_on_aggregation(aggregation)
-        aggregate_reflections[aggregation]
+        aggregate_reflections[aggregation.to_sym]
       end
 
       # Returns a Hash of name of the reflection as the key and a AssociationReflection as the value.
@@ -92,12 +92,12 @@ module ActiveRecord
       #
       #   @api public
       def reflect_on_association(association)
-        reflections[association]
+        reflections[association.to_sym]
       end
 
       #   @api private
       def _reflect_on_association(association) #:nodoc:
-        _reflections[association]
+        _reflections[association.to_sym]
       end
 
       # Returns an array of AssociationReflection objects for all associations which have <tt>:autosave</tt> enabled.
@@ -432,7 +432,7 @@ module ActiveRecord
         # returns either nil or the inverse association name that it finds.
         def automatic_inverse_of
           if can_find_inverse_of_automatically?(self)
-            inverse_name = ActiveSupport::Inflector.underscore(active_record.name).to_sym
+            inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name).to_sym
 
             begin
               reflection = klass._reflect_on_association(inverse_name)

data/lib/active_record/relation.rb

@@ -72,7 +72,14 @@ module ActiveRecord
 
     def _update_record(values, id, id_was) # :nodoc:
       substitutes, binds = substitute_values values
-      um = @klass.unscoped.where(@klass.arel_table[@klass.primary_key].eq(id_was || id)).arel.compile_update(substitutes, @klass.primary_key)
+
+      scope = @klass.unscoped
+
+      if @klass.finder_needs_type_condition?
+        scope.unscope!(where: @klass.inheritance_column)
+      end
+
+      um = scope.where(@klass.arel_table[@klass.primary_key].eq(id_was || id)).arel.compile_update(substitutes, @klass.primary_key)
 
       @klass.connection.update(
         um,

data/lib/active_record/relation/calculations.rb

@@ -176,8 +176,11 @@ module ActiveRecord
           }
         end
 
-        result = result.map do |attributes|
-          values = klass.initialize_attributes(attributes).values
+        result = result.rows.map do |values|
+          values = result.columns.zip(values).map do |column_name, value|
+            single_attr_hash = { column_name => value }
+            klass.initialize_attributes(single_attr_hash).values.first
+          end
 
           columns.zip(values).map { |column, value| column.type_cast value }
         end

data/lib/active_record/relation/finder_methods.rb

@@ -63,7 +63,7 @@ module ActiveRecord
     #   # returns an Array of the required fields, available since Rails 3.1.
     def find(*args)
       if block_given?
-        to_a.find { |*block_args| yield(*block_args) }
+        to_a.find(*args) { |*block_args| yield(*block_args) }
       else
         find_with_ids(*args)
       end
@@ -323,7 +323,16 @@ module ActiveRecord
     private
 
     def find_with_associations
-      join_dependency = construct_join_dependency
+      # NOTE: the JoinDependency constructed here needs to know about
+      #       any joins already present in `self`, so pass them in
+      #
+      # failing to do so means that in cases like activerecord/test/cases/associations/inner_join_association_test.rb:136
+      # incorrect SQL is generated. In that case, the join dependency for
+      # SpecialCategorizations is constructed without knowledge of the
+      # preexisting join in joins_values to categorizations (by way of
+      # the `has_many :through` for categories).
+      #
+      join_dependency = construct_join_dependency(joins_values)
 
       aliases  = join_dependency.aliases
       relation = select aliases.columns

data/lib/active_record/relation/query_methods.rb

@@ -943,9 +943,7 @@ module ActiveRecord
         opts = PredicateBuilder.resolve_column_aliases(klass, opts)
         attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts)
 
-        attributes.values.grep(ActiveRecord::Relation) do |rel|
-          self.bind_values += rel.bind_values
-        end
+        add_relations_to_bind_values(attributes)
 
         PredicateBuilder.build_from_hash(klass, attributes, table)
       else
@@ -1098,5 +1096,19 @@ module ActiveRecord
         raise ArgumentError, "The method .#{method_name}() must contain arguments."
       end
     end
+
+    # This function is recursive just for better readablity.
+    # #where argument doesn't support more than one level nested hash in real world.
+    def add_relations_to_bind_values(attributes)
+      if attributes.is_a?(Hash)
+        attributes.each_value do |value|
+          if value.is_a?(ActiveRecord::Relation)
+            self.bind_values += value.bind_values
+          else
+            add_relations_to_bind_values(value)
+          end
+        end
+      end
+    end
   end
 end

data/lib/active_record/schema_dumper.rb

@@ -112,7 +112,8 @@ HEADER
           # first dump primary key column
           if @connection.respond_to?(:pk_and_sequence_for)
             pk, _ = @connection.pk_and_sequence_for(table)
-          elsif @connection.respond_to?(:primary_key)
+          end
+          if !pk && @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
           end
 

data/lib/active_record/schema_migration.rb

@@ -5,6 +5,9 @@ require 'active_record/base'
 module ActiveRecord
   class SchemaMigration < ActiveRecord::Base
     class << self
+      def primary_key
+        nil
+      end
 
       def table_name
         "#{table_name_prefix}#{ActiveRecord::Base.schema_migrations_table_name}#{table_name_suffix}"
@@ -36,6 +39,10 @@ module ActiveRecord
           connection.drop_table(table_name)
         end
       end
+
+      def normalize_migration_number(number)
+        "%.3d" % number.to_i
+      end
     end
 
     def version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ files:
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
+- lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
@@ -242,9 +243,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0