activerecord 4.1.2.rc1 → 4.1.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aca93fe15c355b8cd4de74c821591b11d0f2e9e
-  data.tar.gz: 4f0d15d06ec38cfc876be6fdab7a6e79cb47d4b9
+  metadata.gz: bc2e7dd1ec009c695170d04fca72e1b73f2cecf5
+  data.tar.gz: d794b80eaf2e1a025ae146107a2119c8b452006f
 SHA512:
-  metadata.gz: 557f017b351b3e629907d188ba6aaa0d18e010314f84dcdf5eca5d1fafc93f6d1d58ff89ed181f196809c03899886f324765797d6bd365e581f4c93aa8853967
-  data.tar.gz: 167461b2b4db82feadabd726816d5442534a088700646a7305b3d83eeb5984d8b1be4fd9e2ba815aa01386498ba22ee7aca58d9a75b01dffc88f886ca226af3b
+  metadata.gz: 7839508ecbc9316c73e26957103f7f8ab36db341c186f4307954ffdccbffd62cb743711af57f053bf121c53fb43ada493d31168bee3a36d1913e9ee8d3e1d8f1
+  data.tar.gz: 8ea047f850004ebfe879797124eff1eec2c552ced7cf537b61bcbf0078d98641a219839c522ba1f41fc7d6b35c6a8ee5477f8ce6d867cc7b7fcc350c3f4854f1

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Rails 4.1.2 (May 27, 2014) ##
+## Rails 4.1.2 (June 16, 2014) ##
+
+*   Fix regression on eager loading association based on SQL query rather than
+    existing column.
+
+    Fixes #15480.
+
+    *Lauro Caetano*, *Carlos Antonio da Silva*
 
 *   Fix redefine a has_and_belongs_to_many inside inherited class
     Fixing regression case, where redefining the same has_an_belongs_to_many
@@ -278,10 +285,6 @@
 
     *Luke Steensen*
 
-*   Make possible to change `record_timestamps` inside Callbacks.
-
-    *Tieg Zaharia*
-
 *   Fixed error where .persisted? throws SystemStackError for an unsaved model with a
     custom primary key that didn't save due to validation error.
 

data/lib/active_record/associations/has_many_through_association.rb

@@ -83,14 +83,18 @@ module ActiveRecord
           @through_records[record.object_id] ||= begin
             ensure_mutable
 
-            through_record = through_association.build through_scope_attributes
+            through_record = through_association.build(*options_for_through_record)
             through_record.send("#{source_reflection.name}=", record)
             through_record
           end
         end
 
+        def options_for_through_record
+          [through_scope_attributes]
+        end
+
         def through_scope_attributes
-          scope.where_values_hash(through_association.reflection.name.to_s)
+          scope.where_values_hash(through_association.reflection.name.to_s).except!(through_association.reflection.foreign_key)
         end
 
         def save_through_record(record)

data/lib/active_record/associations/preloader/association.rb

@@ -104,11 +104,13 @@ module ActiveRecord
         end
 
         def association_key_type
-          @klass.column_types[association_key_name.to_s].type
+          column = @klass.column_types[association_key_name.to_s]
+          column && column.type
         end
 
         def owner_key_type
-          @model.column_types[owner_key_name.to_s].type
+          column = @model.column_types[owner_key_name.to_s]
+          column && column.type
         end
 
         def load_slices(slices)

data/lib/active_record/base.rb

@@ -309,8 +309,8 @@ module ActiveRecord #:nodoc:
     include Locking::Optimistic
     include Locking::Pessimistic
     include AttributeMethods
-    include Timestamp
     include Callbacks
+    include Timestamp
     include Associations
     include ActiveModel::SecurePassword
     include AutosaveAssociation

data/lib/active_record/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveRecord
     MAJOR = 4
     MINOR = 1
     TINY  = 2
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     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.2.rc1
+  version: 4.1.2.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-16 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.2.rc1
+        version: 4.1.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2.rc1
+        version: 4.1.2.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2.rc1
+        version: 4.1.2.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2.rc1
+        version: 4.1.2.rc2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement