diff options
| author | Jonathan Viney <jonathan.viney@gmail.com> | 2008-05-11 21:01:18 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-11 21:01:18 +0100 |
| commit | 0cbdd96c349c56c47299ca3c2bfa5d8c4f5e5a11 (patch) | |
| tree | 5f21d58b948263a636a7ab5a64d39e38bf6836ed /activerecord/lib | |
| parent | 0b8b582e0668416c6e6760e97a64b9fa3507782c (diff) | |
| download | rails-0cbdd96c349c56c47299ca3c2bfa5d8c4f5e5a11.tar.gz rails-0cbdd96c349c56c47299ca3c2bfa5d8c4f5e5a11.tar.bz2 rails-0cbdd96c349c56c47299ca3c2bfa5d8c4f5e5a11.zip | |
Fix blank conditions on AssociationCollection#find. [#104 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 74299bd572..7999eec55d 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1910,6 +1910,8 @@ module ActiveRecord #:nodoc: # { :name => "foo'bar", :group_id => 4 } returns "name='foo''bar' and group_id='4'" # "name='foo''bar' and group_id='4'" returns "name='foo''bar' and group_id='4'" def sanitize_sql_for_conditions(condition) + return nil if condition.blank? + case condition when Array; sanitize_sql_array(condition) when Hash; sanitize_sql_hash_for_conditions(condition) |