activerecord 4.1.13 → 4.1.14.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of activerecord might be problematic. Click here for more details.

Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +22 -0
  3. data/lib/active_record/associations/join_dependency.rb +2 -1
  4. data/lib/active_record/gem_version.rb +2 -2
  5. metadata +9 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ed354db4c497bfffd4f14eb98b8812670b0809bc
4
- data.tar.gz: 384f16e30be71424c583fe833d090a4b945ec7c3
3
+ metadata.gz: 09f90424e3639ad7b20b8ddda81d8dd9d6e38b24
4
+ data.tar.gz: ea84a3d536f891f4054e096d39dfce427499ba73
5
5
  SHA512:
6
- metadata.gz: 10788ad120edb0fabc290e13f0f9ddb6466cc2185f597fc8581e325eaaf29cad6516b8174c94395491571513cee01c744dd0351002352651aa562660449a1686
7
- data.tar.gz: 0a55b707603118e3e167449fbae921b161457d90001205c5397ae112ac5c0a892c0dc6a29f135d13ae6c4425a7218c9bccdcc5d224f22bb9c9e44b5b69d8ec60
6
+ metadata.gz: edb0961b9233daa07a515060f74d76c0a9b651c58ef59b602c62c5e40fb4ca4f3d3b0dcc583324907e02dedcd32550438da04d30ce4d6b3fb39f2a957468cd80
7
+ data.tar.gz: 21b173353ff196d57f509e529526c56a52c2c958df378fe42d2d862b93ce46bd0b721956ef61640830ec05e3e08094c7f42b9f9b38a5c1a80bbccfcd6191b85e
data/CHANGELOG.md CHANGED
@@ -1,3 +1,25 @@
1
+ ## Rails 4.1.14.rc1 (October 30, 2015) ##
2
+
3
+ * Includes HABTM returns correct size now. It's caused by the join dependency
4
+ only instantiates one HABTM object because the join table hasn't a primary key.
5
+
6
+ Fixes #16032.
7
+
8
+ Examples:
9
+
10
+ before:
11
+
12
+ Project.first.salaried_developers.size # => 3
13
+ Project.includes(:salaried_developers).first.salaried_developers.size # => 1
14
+
15
+ after:
16
+
17
+ Project.first.salaried_developers.size # => 3
18
+ Project.includes(:salaried_developers).first.salaried_developers.size # => 3
19
+
20
+ *Bigxiang*
21
+
22
+
1
23
  ## Rails 4.1.13 (August 24, 2015) ##
2
24
 
3
25
  * Don't define autosave association callbacks twice from
data/lib/active_record/associations/join_dependency.rb CHANGED
@@ -144,7 +144,8 @@ module ActiveRecord
144
144
  column_aliases = aliases.column_aliases join_root
145
145
 
146
146
  result_set.each { |row_hash|
147
- primary_id = type_caster.type_cast row_hash[primary_key]
147
+ parent_key = primary_key ? row_hash[primary_key] : row_hash
148
+ primary_id = type_caster.type_cast parent_key
148
149
  parent = parents[primary_id] ||= join_root.instantiate(row_hash, column_aliases)
149
150
  construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
150
151
  }
data/lib/active_record/gem_version.rb CHANGED
@@ -7,8 +7,8 @@ module ActiveRecord
7
7
  module VERSION
8
8
  MAJOR = 4
9
9
  MINOR = 1
10
- TINY = 13
11
- PRE = nil
10
+ TINY = 14
11
+ PRE = "rc1"
12
12
 
13
13
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
14
14
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.13
4
+ version: 4.1.14.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-24 00:00:00.000000000 Z
11
+ date: 2015-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.1.13
19
+ version: 4.1.14.rc1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 4.1.13
26
+ version: 4.1.14.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.1.13
33
+ version: 4.1.14.rc1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 4.1.13
40
+ version: 4.1.14.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: arel
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -243,14 +243,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
243
243
  version: 1.9.3
244
244
  required_rubygems_version: !ruby/object:Gem::Requirement
245
245
  requirements:
246
- - - ">="
246
+ - - ">"
247
247
  - !ruby/object:Gem::Version
248
- version: '0'
248
+ version: 1.3.1
249
249
  requirements: []
250
250
  rubyforge_project:
251
- rubygems_version: 2.4.7
251
+ rubygems_version: 2.4.5.1
252
252
  signing_key:
253
253
  specification_version: 4
254
254
  summary: Object-relational mapper framework (part of Rails).
255
255
  test_files: []
256
- has_rdoc: