activerecord 5.0.5 → 5.0.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed855b32576503d9b5b55e601f1504ec5af4298c
-  data.tar.gz: f2b29832dcca353efbcdd3771a03f2a464bc0df6
+  metadata.gz: ef1a22534c4086164c0e30f550fef12e900cf9a6
+  data.tar.gz: e237245c3105be1f05652407b6dcdef6f7d85938
 SHA512:
-  metadata.gz: 73225e612d84e880d1ad325bc53268e6bd67b02147190f3ea5b6d0c79fbb3a84d69cd66d32c0a4b6d566352f0d8dcc031e3e22df5216f03651f7b40d0b68fa71
-  data.tar.gz: 03f83e492e88da43185e272dcd2cca677f375c17be16c3e5488fedcd6345fdf5306aa691b8eb393f9f680efb292a5c7b4a27189c8e3d6f179b55992472904a6b
+  metadata.gz: 260360a40ec15318044dd83043059ee0bb8be0e928f3844eb3f940eff9c1a5128706553ce11640374166a4518df342d9e0d7ec4b4440859b73a5cb968b832df6
+  data.tar.gz: e8f0b708bff9d283de1e39454033643d4d7810288c2a15c91ca02c4e0f78ccf88ee01ce3b0aabf9cfff37a35b3b55ec95d7f715d746c2bcb560b12e59fe2c72a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 5.0.6.rc1 (August 24, 2017) ##
+
+*   Ensure `sum` honors `distinct` on `has_many :through` associations
+
+    Fixes #16791
+
+    *Aaron Wortham
+
+
 ## Rails 5.0.5 (July 31, 2017) ##
 
 *   No changes.

data/lib/active_record/associations.rb

@@ -317,17 +317,18 @@ module ActiveRecord
     #                                     |            |  belongs_to  |
     #   generated methods                 | belongs_to | :polymorphic | has_one
     #   ----------------------------------+------------+--------------+---------
-    #   other(force_reload=false)         |     X      |      X       |    X
+    #   other                             |     X      |      X       |    X
     #   other=(other)                     |     X      |      X       |    X
     #   build_other(attributes={})        |     X      |              |    X
     #   create_other(attributes={})       |     X      |              |    X
     #   create_other!(attributes={})      |     X      |              |    X
+    #   reload_other                      |     X      |      X       |    X
     #
     # === Collection associations (one-to-many / many-to-many)
     #                                     |       |          | has_many
     #   generated methods                 | habtm | has_many | :through
     #   ----------------------------------+-------+----------+----------
-    #   others(force_reload=false)        |   X   |    X     |    X
+    #   others                            |   X   |    X     |    X
     #   others=(other,other,...)          |   X   |    X     |    X
     #   other_ids                         |   X   |    X     |    X
     #   other_ids=(id,id,...)             |   X   |    X     |    X
@@ -351,6 +352,7 @@ module ActiveRecord
     #   others.exists?                    |   X   |    X     |    X
     #   others.distinct                   |   X   |    X     |    X
     #   others.reset                      |   X   |    X     |    X
+    #   others.reload                     |   X   |    X     |    X
     #
     # === Overriding generated methods
     #
@@ -1162,9 +1164,9 @@ module ActiveRecord
       # +collection+ is a placeholder for the symbol passed as the +name+ argument, so
       # <tt>has_many :clients</tt> would add among others <tt>clients.empty?</tt>.
       #
-      # [collection(force_reload = false)]
-      #   Returns an array of all the associated objects.
-      #   An empty array is returned if none are found.
+      # [collection]
+      #   Returns a Relation of all the associated objects.
+      #   An empty Relation is returned if none are found.
       # [collection<<(object, ...)]
       #   Adds one or more objects to the collection by setting their foreign keys to the collection's primary key.
       #   Note that this operation instantly fires update SQL without waiting for the save or update call on the
@@ -1221,6 +1223,9 @@ module ActiveRecord
       # [collection.create!(attributes = {})]
       #   Does the same as <tt>collection.create</tt>, but raises ActiveRecord::RecordInvalid
       #   if the record is invalid.
+      # [collection.reload]
+      #   Returns a Relation of all of the associated objects, forcing a database read.
+      #   An empty Relation is returned if none are found.
       #
       # === Example
       #
@@ -1240,6 +1245,7 @@ module ActiveRecord
       # * <tt>Firm#clients.build</tt> (similar to <tt>Client.new("firm_id" => id)</tt>)
       # * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save; c</tt>)
       # * <tt>Firm#clients.create!</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save!</tt>)
+      # * <tt>Firm#clients.reload</tt>
       # The declaration can also include an +options+ hash to specialize the behavior of the association.
       #
       # === Scopes
@@ -1376,7 +1382,7 @@ module ActiveRecord
       # +association+ is a placeholder for the symbol passed as the +name+ argument, so
       # <tt>has_one :manager</tt> would add among others <tt>manager.nil?</tt>.
       #
-      # [association(force_reload = false)]
+      # [association]
       #   Returns the associated object. +nil+ is returned if none is found.
       # [association=(associate)]
       #   Assigns the associate object, extracts the primary key, sets it as the foreign key,
@@ -1393,6 +1399,8 @@ module ActiveRecord
       # [create_association!(attributes = {})]
       #   Does the same as <tt>create_association</tt>, but raises ActiveRecord::RecordInvalid
       #   if the record is invalid.
+      # [reload_association]
+      #   Returns the associated object, forcing a database read.
       #
       # === Example
       #
@@ -1402,6 +1410,7 @@ module ActiveRecord
       # * <tt>Account#build_beneficiary</tt> (similar to <tt>Beneficiary.new("account_id" => id)</tt>)
       # * <tt>Account#create_beneficiary</tt> (similar to <tt>b = Beneficiary.new("account_id" => id); b.save; b</tt>)
       # * <tt>Account#create_beneficiary!</tt> (similar to <tt>b = Beneficiary.new("account_id" => id); b.save!; b</tt>)
+      # * <tt>Account#reload_beneficiary</tt>
       #
       # === Scopes
       #
@@ -1508,7 +1517,7 @@ module ActiveRecord
       # +association+ is a placeholder for the symbol passed as the +name+ argument, so
       # <tt>belongs_to :author</tt> would add among others <tt>author.nil?</tt>.
       #
-      # [association(force_reload = false)]
+      # [association]
       #   Returns the associated object. +nil+ is returned if none is found.
       # [association=(associate)]
       #   Assigns the associate object, extracts the primary key, and sets it as the foreign key.
@@ -1522,6 +1531,8 @@ module ActiveRecord
       # [create_association!(attributes = {})]
       #   Does the same as <tt>create_association</tt>, but raises ActiveRecord::RecordInvalid
       #   if the record is invalid.
+      # [reload_association]
+      #   Returns the associated object, forcing a database read.
       #
       # === Example
       #
@@ -1531,6 +1542,7 @@ module ActiveRecord
       # * <tt>Post#build_author</tt> (similar to <tt>post.author = Author.new</tt>)
       # * <tt>Post#create_author</tt> (similar to <tt>post.author = Author.new; post.author.save; post.author</tt>)
       # * <tt>Post#create_author!</tt> (similar to <tt>post.author = Author.new; post.author.save!; post.author</tt>)
+      # * <tt>Post#reload_author</tt>
       # The declaration can also include an +options+ hash to specialize the behavior of the association.
       #
       # === Scopes
@@ -1666,9 +1678,9 @@ module ActiveRecord
       # +collection+ is a placeholder for the symbol passed as the +name+ argument, so
       # <tt>has_and_belongs_to_many :categories</tt> would add among others <tt>categories.empty?</tt>.
       #
-      # [collection(force_reload = false)]
-      #   Returns an array of all the associated objects.
-      #   An empty array is returned if none are found.
+      # [collection]
+      #   Returns a Relation of all the associated objects.
+      #   An empty Relation is returned if none are found.
       # [collection<<(object, ...)]
       #   Adds one or more objects to the collection by creating associations in the join table
       #   (<tt>collection.push</tt> and <tt>collection.concat</tt> are aliases to this method).
@@ -1706,6 +1718,9 @@ module ActiveRecord
       #   Returns a new object of the collection type that has been instantiated
       #   with +attributes+, linked to this object through the join table, and that has already been
       #   saved (if it passed the validation).
+      # [collection.reload]
+      #   Returns a Relation of all of the associated objects, forcing a database read.
+      #   An empty Relation is returned if none are found.
       #
       # === Example
       #
@@ -1724,6 +1739,7 @@ module ActiveRecord
       # * <tt>Developer#projects.exists?(...)</tt>
       # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("developer_id" => id)</tt>)
       # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("developer_id" => id); c.save; c</tt>)
+      # * <tt>Developer#projects.reload</tt>
       # The declaration may include an +options+ hash to specialize the behavior of the association.
       #
       # === Scopes

data/lib/active_record/associations/collection_association.rb

@@ -67,11 +67,14 @@ module ActiveRecord
         pk_type = reflection.association_primary_key_type
         ids = Array(ids).reject(&:blank?)
         ids.map! { |i| pk_type.cast(i) }
-        records = klass.where(reflection.association_primary_key => ids).index_by do |r|
-          r.send(reflection.association_primary_key)
+
+        primary_key = reflection.association_primary_key
+        records = klass.where(primary_key => ids).index_by do |r|
+          r.public_send(primary_key)
         end.values_at(*ids).compact
+
         if records.size != ids.size
-          klass.all.raise_record_not_found_exception!(ids, records.size, ids.size, reflection.association_primary_key)
+          klass.all.raise_record_not_found_exception!(ids, records.size, ids.size, primary_key)
         else
           replace(records)
         end

data/lib/active_record/associations/join_dependency/join_association.rb

@@ -54,15 +54,13 @@ module ActiveRecord
             end
             scope_chain_index += 1
 
+            relation = ActiveRecord::Relation.create(klass, table, predicate_builder)
+            current_scope = klass.current_scope
+
             klass_scope =
-              if klass.current_scope && klass.current_scope.values.empty?
-                klass.unscoped
+              if current_scope && current_scope.empty_scope?
+                relation
               else
-                relation = ActiveRecord::Relation.create(
-                  klass,
-                  table,
-                  predicate_builder,
-                )
                 klass.send(:build_default_scope, relation)
               end
             scope_chain_items.concat [klass_scope].compact

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

@@ -166,7 +166,7 @@ module ActiveRecord
           end
 
           scope.unscope_values = Array(values[:unscope]) + Array(preload_values[:unscope])
-          klass.default_scoped.merge(scope)
+          klass.scope_for_association.merge(scope)
         end
       end
     end

data/lib/active_record/associations/through_association.rb

@@ -14,7 +14,7 @@ module ActiveRecord
         def target_scope
           scope = super
           reflection.chain.drop(1).each do |reflection|
-            relation = reflection.klass.all
+            relation = reflection.klass.scope_for_association
             scope.merge!(
               relation.except(:select, :create_with, :includes, :preload, :joins, :eager_load)
             )

data/lib/active_record/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveRecord
   module VERSION
     MAJOR = 5
     MINOR = 0
-    TINY  = 5
-    PRE   = nil
+    TINY  = 6
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/reflection.rb

@@ -644,6 +644,10 @@ module ActiveRecord
           Associations::HasManyAssociation
         end
       end
+
+      def association_primary_key(klass = nil)
+        primary_key(klass || self.klass)
+      end
     end
 
     class HasOneReflection < AssociationReflection # :nodoc:

data/lib/active_record/relation.rb

@@ -347,7 +347,7 @@ module ActiveRecord
     # Please check unscoped if you want to remove all previous scopes (including
     # the default_scope) during the execution of a block.
     def scoping
-      previous, klass.current_scope = klass.current_scope, self
+      previous, klass.current_scope = klass.current_scope(true), self
       yield
     ensure
       klass.current_scope = previous
@@ -689,6 +689,10 @@ module ActiveRecord
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
+    def empty_scope? # :nodoc:
+      @values == klass.unscoped.values
+    end
+
     protected
 
       def load_records(records)

data/lib/active_record/relation/calculations.rb

@@ -238,6 +238,10 @@ module ActiveRecord
 
         select_value = operation_over_aggregate_column(column, operation, distinct)
 
+        if operation == "sum" && distinct
+          select_value.distinct = true
+        end
+
         column_alias = select_value.alias
         column_alias ||= @klass.connection.column_name_for_operation(operation, select_value)
         relation.select_values = [select_value]

data/lib/active_record/scoping.rb

@@ -10,8 +10,8 @@ module ActiveRecord
     end
 
     module ClassMethods
-      def current_scope #:nodoc:
-        ScopeRegistry.value_for(:current_scope, self)
+      def current_scope(skip_inherited_scope = false) # :nodoc:
+        ScopeRegistry.value_for(:current_scope, self, skip_inherited_scope)
       end
 
       def current_scope=(scope) #:nodoc:
@@ -75,8 +75,9 @@ module ActiveRecord
       end
 
       # Obtains the value for a given +scope_type+ and +model+.
-      def value_for(scope_type, model)
+      def value_for(scope_type, model, skip_inherited_scope = false)
         raise_invalid_scope_type!(scope_type)
+        return @registry[scope_type][model.name] if skip_inherited_scope
         klass = model
         base = model.base_class
         while klass <= base

data/lib/active_record/scoping/named.rb

@@ -29,8 +29,17 @@ module ActiveRecord
           end
         end
 
-        def default_scoped # :nodoc:
-          scope = relation
+        def scope_for_association(scope = relation) # :nodoc:
+          current_scope = self.current_scope
+
+          if current_scope && current_scope.empty_scope?
+            scope
+          else
+            default_scoped(scope)
+          end
+        end
+
+        def default_scoped(scope = relation) # :nodoc:
           build_default_scope(scope) || scope
         end
 

data/lib/active_record/tasks/postgresql_database_tasks.rb

@@ -16,7 +16,7 @@ module ActiveRecord
           configuration.merge('encoding' => encoding)
         establish_connection configuration
       rescue ActiveRecord::StatementInvalid => error
-        if /database .* already exists/ === error.message
+        if error.cause.is_a?(PG::DuplicateDatabase)
           raise DatabaseAlreadyExists
         else
           raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -323,9 +323,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12