activerecord 4.1.13 → 4.1.14.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed354db4c497bfffd4f14eb98b8812670b0809bc
-  data.tar.gz: 384f16e30be71424c583fe833d090a4b945ec7c3
+  metadata.gz: 09f90424e3639ad7b20b8ddda81d8dd9d6e38b24
+  data.tar.gz: ea84a3d536f891f4054e096d39dfce427499ba73
 SHA512:
-  metadata.gz: 10788ad120edb0fabc290e13f0f9ddb6466cc2185f597fc8581e325eaaf29cad6516b8174c94395491571513cee01c744dd0351002352651aa562660449a1686
-  data.tar.gz: 0a55b707603118e3e167449fbae921b161457d90001205c5397ae112ac5c0a892c0dc6a29f135d13ae6c4425a7218c9bccdcc5d224f22bb9c9e44b5b69d8ec60
+  metadata.gz: edb0961b9233daa07a515060f74d76c0a9b651c58ef59b602c62c5e40fb4ca4f3d3b0dcc583324907e02dedcd32550438da04d30ce4d6b3fb39f2a957468cd80
+  data.tar.gz: 21b173353ff196d57f509e529526c56a52c2c958df378fe42d2d862b93ce46bd0b721956ef61640830ec05e3e08094c7f42b9f9b38a5c1a80bbccfcd6191b85e

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## Rails 4.1.14.rc1 (October 30, 2015) ##
+
+*   Includes HABTM returns correct size now. It's caused by the join dependency
+    only instantiates one HABTM object because the join table hasn't a primary key.
+
+    Fixes #16032.
+
+    Examples:
+
+        before:
+
+        Project.first.salaried_developers.size # => 3
+        Project.includes(:salaried_developers).first.salaried_developers.size # => 1
+
+        after:
+
+        Project.first.salaried_developers.size # => 3
+        Project.includes(:salaried_developers).first.salaried_developers.size # => 3
+
+    *Bigxiang*
+
+
 ## Rails 4.1.13 (August 24, 2015) ##
 
 *   Don't define autosave association callbacks twice from

data/lib/active_record/associations/join_dependency.rb

@@ -144,7 +144,8 @@ module ActiveRecord
         column_aliases = aliases.column_aliases join_root
 
         result_set.each { |row_hash|
-          primary_id = type_caster.type_cast row_hash[primary_key]
+          parent_key = primary_key ? row_hash[primary_key] : row_hash
+          primary_id = type_caster.type_cast parent_key
           parent = parents[primary_id] ||= join_root.instantiate(row_hash, column_aliases)
           construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
         }

data/lib/active_record/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.13
+  version: 4.1.14.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-30 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.13
+        version: 4.1.14.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: 4.1.14.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: 4.1.14.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: 4.1.14.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -243,14 +243,13 @@ 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.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
-has_rdoc: