diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:19 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:19 -0700 |
commit | 5f91ea3dc1ed3fa1c6be2cff7de1d1663990b0c3 (patch) | |
tree | ed5851f76e6fb1852c3f37aed743250cbdb7dd62 /activerecord/lib/active_record/associations/association_scope.rb | |
parent | 51af1e25789728248078db6b17989b252ac2e53c (diff) | |
parent | 060c91cd59ab86583a8f2f52142960d3433f62f5 (diff) | |
download | rails-5f91ea3dc1ed3fa1c6be2cff7de1d1663990b0c3.tar.gz rails-5f91ea3dc1ed3fa1c6be2cff7de1d1663990b0c3.tar.bz2 rails-5f91ea3dc1ed3fa1c6be2cff7de1d1663990b0c3.zip |
Merge branch 'master-sec'
* master-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
Diffstat (limited to 'activerecord/lib/active_record/associations/association_scope.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 5a44d3a156..89a626693d 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -96,7 +96,7 @@ module ActiveRecord conditions.each do |condition| if options[:through] && condition.is_a?(Hash) - condition = { table.name => condition } + condition = disambiguate_condition(table, condition) end scope = scope.where(interpolate(condition)) @@ -113,7 +113,7 @@ module ActiveRecord conditions.each do |condition| condition = interpolate(condition) - condition = { (table.table_alias || table.name) => condition } unless i == 0 + condition = disambiguate_condition(table, condition) unless i == 0 scope = scope.where(condition) end @@ -138,6 +138,21 @@ module ActiveRecord end end + def disambiguate_condition(table, condition) + if condition.is_a?(Hash) + Hash[ + condition.map do |k, v| + if v.is_a?(Hash) + [k, v] + else + [table.table_alias || table.name, { k => v }] + end + end + ] + else + condition + end + end end end end |