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/schema | |
| 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/schema')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 98f2492ef8..0584df87c6 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -198,6 +198,7 @@ ActiveRecord::Schema.define do t.references :author, polymorphic: true t.string :resource_id t.string :resource_type + t.integer :developer_id end create_table :companies, force: true do |t| |