diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-01-25 16:44:04 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-01-25 16:46:54 -0700 |
| commit | 320600c773a16418fe37eccea2eb1082f58062f7 (patch) | |
| tree | d86a82ab4a16a178c16d747257d9dac46a3c0908 /activerecord/lib/active_record/associations/association_scope.rb | |
| parent | 87726b93d4fd447671d0b20ae2ec37a9eb4f2fd4 (diff) | |
| download | rails-320600c773a16418fe37eccea2eb1082f58062f7.tar.gz rails-320600c773a16418fe37eccea2eb1082f58062f7.tar.bz2 rails-320600c773a16418fe37eccea2eb1082f58062f7.zip | |
Remove all references to `where_values` in association code
Diffstat (limited to 'activerecord/lib/active_record/associations/association_scope.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 3d71e73b3c..a2550fa382 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -167,8 +167,7 @@ module ActiveRecord scope.includes! item.includes_values end - scope.where_values += item.where_values - scope.bind_values += item.bind_values + scope.where_clause += item.where_clause scope.order_values |= item.order_values end |