diff options
author | Agis- <corestudiosinc@gmail.com> | 2014-07-15 03:25:18 +0300 |
---|---|---|
committer | Agis- <corestudiosinc@gmail.com> | 2014-08-20 08:25:58 +0300 |
commit | 431f8e01196044877c2acea4271410b1033ec915 (patch) | |
tree | 82a5a15529f75967a30d601eaa2099b6e1f4c8cf /activerecord/test/models | |
parent | 7422d2175d72f3e32f48f52ae4101cf4b6297c39 (diff) | |
download | rails-431f8e01196044877c2acea4271410b1033ec915.tar.gz rails-431f8e01196044877c2acea4271410b1033ec915.tar.bz2 rails-431f8e01196044877c2acea4271410b1033ec915.zip |
Only merge scopes with zero arity in has_many through
with dynamic conditions.
Fixes #16128
This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
so it's present from 4.1.2-rc1 and after.
https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
merges any relation scopes passed as proc objects to the relation,
but does *not* take into account the arity of the lambda.
To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/comment.rb | 1 | ||||
-rw-r--r-- | activerecord/test/models/developer.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb index 15970758db..7a88299d08 100644 --- a/activerecord/test/models/comment.rb +++ b/activerecord/test/models/comment.rb @@ -9,6 +9,7 @@ class Comment < ActiveRecord::Base belongs_to :post, :counter_cache => true belongs_to :author, polymorphic: true belongs_to :resource, polymorphic: true + belongs_to :developer has_many :ratings diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index 5bd2f00129..3627cfdd09 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -46,6 +46,8 @@ class Developer < ActiveRecord::Base has_many :audit_logs has_many :contracts has_many :firms, :through => :contracts, :source => :firm + has_many :comments, ->(developer) { where(body: "I'm #{developer.name}") } + has_many :ratings, through: :comments scope :jamises, -> { where(:name => 'Jamis') } |