activerecord 4.2.1.rc1 → 4.2.1.rc2

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/lib/active_record/gem_version.rb +1 -1
  3. data/lib/active_record/locking/optimistic.rb +1 -1
  4. data/lib/active_record/relation/query_methods.rb +9 -5
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7d994cda5e6f13c062c37a85942c342568f8be89
4
- data.tar.gz: 1fe18033994d5cfdf6dd0b7d888b40e19639e59f
3
+ metadata.gz: 673f2cc385d13e9219f541c6f07141fd453fa826
4
+ data.tar.gz: 888a09a78f10eb22d67f7f4d3567c34833bf4b02
5
5
  SHA512:
6
- metadata.gz: e3659d347024bc585bb04bc102d0c0c758510fc54ad788765cd1d2c4525939ce3a774150e288af4cc1bc6a96f4f8e29f1c05453453ede3b8416f401603fd43e4
7
- data.tar.gz: f4c192fb5e0785bd0dc306629efe2d6473e8b8b65001a2cf3d0c1ec33ca97869ca24abff38c0d6561c3e4c3082f7aaf9d63946d69514143ef77907e3e8ef72b4
6
+ metadata.gz: 8e5cdf963547728d543ba7de810a7140e1d3418f308e16085da14f8299c189118255ad2abac08f3b1194ba2398d6cf2b8e15bfa157179bede57575eeeef67e98
7
+ data.tar.gz: a56c7d2f09252a369842d07e8ab0ec054d537d0538f975bf4c85b9ec4c7d9739ed82129276660909fdb5c64dc1fd78727fdff9e11f02061f4cfcd779bcb74d5c
data/lib/active_record/gem_version.rb CHANGED
@@ -8,7 +8,7 @@ module ActiveRecord
8
8
  MAJOR = 4
9
9
  MINOR = 2
10
10
  TINY = 1
11
- PRE = "rc1"
11
+ PRE = "rc2"
12
12
 
13
13
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
14
14
  end
data/lib/active_record/locking/optimistic.rb CHANGED
@@ -93,7 +93,7 @@ module ActiveRecord
93
93
  self.class.primary_key => id,
94
94
  lock_col => previous_lock_value,
95
95
  ).update_all(
96
- Hash[attribute_names.map do |name|
96
+ Hash[attributes_for_update(attribute_names).map do |name|
97
97
  [name, _read_attribute(name)]
98
98
  end]
99
99
  )
data/lib/active_record/relation/query_methods.rb CHANGED
@@ -1064,11 +1064,15 @@ module ActiveRecord
1064
1064
  end
1065
1065
 
1066
1066
  def arel_columns(columns)
1067
- columns.map do |field|
1068
- if (Symbol === field || String === field) && columns_hash.key?(field.to_s)
1069
- arel_table[field]
1070
- else
1071
- field
1067
+ if from_value
1068
+ columns
1069
+ else
1070
+ columns.map do |field|
1071
+ if (Symbol === field || String === field) && columns_hash.key?(field.to_s)
1072
+ arel_table[field]
1073
+ else
1074
+ field
1075
+ end
1072
1076
  end
1073
1077
  end
1074
1078
  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.2.1.rc1
4
+ version: 4.2.1.rc2
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-02-20 00:00:00.000000000 Z
11
+ date: 2015-02-25 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.2.1.rc1
19
+ version: 4.2.1.rc2
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.2.1.rc1
26
+ version: 4.2.1.rc2
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.2.1.rc1
33
+ version: 4.2.1.rc2
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.2.1.rc1
40
+ version: 4.2.1.rc2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: arel
43
43
  requirement: !ruby/object:Gem::Requirement