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/relation/predicate_builder.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/relation/predicate_builder.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index 6a0cdd5917..cb8f903474 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -6,7 +6,7 @@ module ActiveRecord if value.is_a?(Hash) table = Arel::Table.new(column, engine) - build_from_hash(engine, value, table) + value.map { |k,v| build(table[k.to_sym], v) } else column = column.to_s |