activerecord 4.1.14.2 → 4.1.15.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a621f2199b663814b7fdb47a9a456cc3bd1fe48
-  data.tar.gz: c96508b6d143c9771f39aa09ea41181d78a2776d
+  metadata.gz: 4514b18c44984aca0077697df0b7ef368749aa06
+  data.tar.gz: bceae7bb43c0da51ad533c29db67e72c43b5529d
 SHA512:
-  metadata.gz: a7bd4eb638180b63edddd0c8ac977982cf197bc8a191e2c759439e5d45ddbc994adbc66cbdfce091d2a298ae62fb0dd8e22519e0ed4859dc56275df6b2327e5f
-  data.tar.gz: 20909b7b6853c70212e5ce310619c91283ea8c561901794ba8af12dfa2eaebab830a96de3b9ef3b885d52ffafd9406d3ecf243f149b74c27d2d63268f9d1da38
+  metadata.gz: 515d9171802370bcf61490d585f03f0f067ecb25fa4eee20dbd810a1e6f12673e9bc8cd6a113db560c4f60613ace5ef338796218a1e489e7db5f46a224f42cbd
+  data.tar.gz: 968f179b667463b9fad444b3e0609ca7de5c93db8bf0b193513e7e7d938a4d8acfe13e02d247652c9d875c4f57b20a32ad61734fa2cf2352252048fe0a77f052

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 4.1.15.rc1 (March 01, 2016) ##
+
+*   Fixes custom primary keys for associations when calling `Relation#where`
+
+    Fixes #23327.
+
+    *Rick Song*
+
+*   No longer pass deprecated option `-i` to `pg_dump`.
+
+    *Paul Sadauskas*
+
+
 ## Rails 4.1.14.2 (February 26, 2016) ##
 
 *   No changes.

data/lib/active_record/gem_version.rb

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

data/lib/active_record/relation/predicate_builder.rb

@@ -56,7 +56,8 @@ module ActiveRecord
       # For polymorphic relationships, find the foreign key and type:
       # PriceEstimate.where(estimate_of: treasure)
       if klass && reflection = klass._reflect_on_association(column.to_sym)
-        if reflection.polymorphic? && base_class = polymorphic_base_class_from_value(value)
+        base_class = polymorphic_base_class_from_value(value)
+        if reflection.polymorphic? && base_class
           queries << build(table[reflection.foreign_type], base_class)
         end
 

data/lib/active_record/relation/spawn_methods.rb

@@ -12,6 +12,7 @@ module ActiveRecord
 
     # Merges in the conditions from <tt>other</tt>, if <tt>other</tt> is an <tt>ActiveRecord::Relation</tt>.
     # Returns an array representing the intersection of the resulting records with <tt>other</tt>, if <tt>other</tt> is an array.
+    #
     #   Post.where(published: true).joins(:comments).merge( Comment.where(spam: false) )
     #   # Performs a single join query with both where conditions.
     #
@@ -37,11 +38,14 @@ module ActiveRecord
     end
 
     def merge!(other) # :nodoc:
-      if !other.is_a?(Relation) && other.respond_to?(:to_proc)
+      if other.is_a?(Hash)
+        Relation::HashMerger.new(self, other).merge
+      elsif other.is_a?(Relation)
+        Relation::Merger.new(self, other).merge
+      elsif other.respond_to?(:to_proc)
         instance_exec(&other)
       else
-        klass = other.is_a?(Hash) ? Relation::HashMerger : Relation::Merger
-        klass.new(self, other).merge
+        raise ArgumentError, "#{other.inspect} is not an ActiveRecord::Relation"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.14.2
+  version: 4.1.15.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 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.14.2
+        version: 4.1.15.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.14.2
+        version: 4.1.15.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.14.2
+        version: 4.1.15.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.14.2
+        version: 4.1.15.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -243,9 +243,9 @@ 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.5.1