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

5 files changed, 11 insertions, 5 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0ddefd8e92..f141c4b4b8 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [DHH]
+
 * Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick]
 
 * Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [josh@hasmanythrough.com]
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 511af69428..4d878e6a1d 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1309,7 +1309,11 @@ module ActiveRecord #:nodoc:
 
         def quote_bound_value(value) #:nodoc:
           if (value.respond_to?(:map) && !value.is_a?(String))
-            value.map { |v| connection.quote(v) }.join(',')
+            if value.empty?
+              "null"
+            else
+              value.map { |v| connection.quote(v) }.join(',')
+            end
           else
             connection.quote(value)
           end
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 094d533a22..70035d6b4e 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -933,10 +933,10 @@ class BasicsTest < Test::Unit::TestCase
   end
 
   def test_quoting_arrays
-    replies = Reply.find(:all, :conditions => [ "id IN (?)", topics(:first).replies.to_s(:db) ])
+    replies = Reply.find(:all, :conditions => [ "id IN (?)", topics(:first).replies.collect(&:id) ])
     assert_equal topics(:first).replies.size, replies.size
 
-    replies = Reply.find(:all, :conditions => [ "id IN (?)", [].to_s(:db) ])
+    replies = Reply.find(:all, :conditions => [ "id IN (?)", [] ])
     assert_equal 0, replies.size
   end
 
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