activerecord 4.1.2.rc2 → 4.1.2.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2e7dd1ec009c695170d04fca72e1b73f2cecf5
-  data.tar.gz: d794b80eaf2e1a025ae146107a2119c8b452006f
+  metadata.gz: 3688b8be6d02e8ce19881d8188f0f862b846ac06
+  data.tar.gz: 9188205a0c31bb3c73a03cedaa5191c03adad39b
 SHA512:
-  metadata.gz: 7839508ecbc9316c73e26957103f7f8ab36db341c186f4307954ffdccbffd62cb743711af57f053bf121c53fb43ada493d31168bee3a36d1913e9ee8d3e1d8f1
-  data.tar.gz: 8ea047f850004ebfe879797124eff1eec2c552ced7cf537b61bcbf0078d98641a219839c522ba1f41fc7d6b35c6a8ee5477f8ce6d867cc7b7fcc350c3f4854f1
+  metadata.gz: 93789a7e5b4235e2aafd305e3278978fcce9f09d0a6f5092b8546adb24d04c15cdd417b4f4a41f90803e3d36f02f658f7f2382f0af4ee7b6ea58076d5ff10b8a
+  data.tar.gz: 81003ea2c57543f23e330b0b0454f9309a7d6f598e2bc8d63ccb344138be9ffc5d81d77efdd000f6f5c89ab0e46596ad96d46d9c9d26236f38a07dccf4d8c682

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.1.2 (June 16, 2014) ##
+## Rails 4.1.2 (June 23, 2014) ##
 
 *   Fix regression on eager loading association based on SQL query rather than
     existing column.

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

@@ -15,7 +15,10 @@ module ActiveRecord::Associations::Builder
         end
 
         private
-        def klass; @rhs_class_name.constantize; end
+
+        def klass
+          @lhs_class.send(:compute_type, @rhs_class_name)
+        end
       end
 
       def self.build(lhs_class, name, options)
@@ -23,13 +26,7 @@ module ActiveRecord::Associations::Builder
           KnownTable.new options[:join_table].to_s
         else
           class_name = options.fetch(:class_name) {
-            model_name = name.to_s.camelize.singularize
-
-            if lhs_class.parent_name
-              model_name.prepend("#{lhs_class.parent_name}::")
-            end
-
-            model_name
+            name.to_s.camelize.singularize
           }
           KnownClass.new lhs_class, class_name
         end

data/lib/active_record/associations/has_many_through_association.rb

@@ -94,7 +94,9 @@ module ActiveRecord
         end
 
         def through_scope_attributes
-          scope.where_values_hash(through_association.reflection.name.to_s).except!(through_association.reflection.foreign_key)
+          scope.where_values_hash(through_association.reflection.name.to_s).
+            except!(through_association.reflection.foreign_key,
+                    through_association.reflection.klass.inheritance_column)
         end
 
         def save_through_record(record)

data/lib/active_record/gem_version.rb

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