diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-01 00:43:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-01 00:43:02 +0000 |
| commit | 9fcc0654c37772a3d6884c5d6f7099a39fe88f73 (patch) | |
| tree | ad4da3182056c22fac7492f315e5d71cee514b29 /activesupport | |
| parent | 24a5a803f3d01d1b6d72e1fb22a97b3922848cae (diff) | |
| download | rails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.tar.gz rails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.tar.bz2 rails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.zip | |
Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4390 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 47d1c3ba46..65eff81083 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -2,7 +2,7 @@ * Added Array#to_s(:db) that'll produce a comma-separated list of ids [DHH]. Example: - Purchase.find(:all, :conditions => [ "product_id IN (?)", shop.products.to_s(:db) ]) + Purchase.find(:all, :conditions => "product_id IN (#{shops.products.to_s(:db)})" * Normalize classify's argument to a String so that it plays nice with Symbols. [Marcel Molina Jr.] diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 7ccc63b31d..35d010b164 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -35,7 +35,7 @@ module ActiveSupport #:nodoc: case format when :db if respond_to?(:empty?) && self.empty? - "0" + "null" else collect { |element| element.id }.join(",") end |