0
@@ -2152,7 +2152,7 @@ module ActiveRecord #:nodoc:
0
         end
0
 
0
         def quote_bound_value(value) #:nodoc:
0
-          if value.respond_to?(:map) && !value.is_a?(String)
0
+          if value.respond_to?(:map) && !value.acts_like?(:string)
0
             if value.respond_to?(:empty?) && value.empty?
0
               connection.quote(nil)
0
             else

0
@@ -297,7 +297,6 @@ class FinderTest < ActiveRecord::TestCase
0
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
0
   end
0
 
0
-
0
   def test_condition_interpolation
0
     assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
0
     assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
0
@@ -392,7 +391,7 @@ class FinderTest < ActiveRecord::TestCase
0
       Company.find(:first, :conditions => ["id=? AND name = ?", 2])
0
     }
0
     assert_raises(ActiveRecord::PreparedStatementInvalid) {
0
-     Company.find(:first, :conditions => ["id=?", 2, 3, 4])
0
+     Company.find(:first, :conditions => ["id=?", 2, 3, 4])
0
     }
0
   end
0
 
0
@@ -455,6 +454,15 @@ class FinderTest < ActiveRecord::TestCase
0
     assert_equal ActiveRecord::Base.connection.quote(''), bind('?', '')
0
   end
0
 
0
+  def test_bind_chars
0
+    quoted_bambi = ActiveRecord::Base.connection.quote("Bambi")
0
+    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
0
+    assert_equal "name=#{quoted_bambi}", bind('name=?', "Bambi")
0
+    assert_equal "name=#{quoted_bambi_and_thumper}", bind('name=?', "Bambi\nand\nThumper")
0
+    assert_equal "name=#{quoted_bambi}", bind('name=?', "Bambi".chars)
0
+    assert_equal "name=#{quoted_bambi_and_thumper}", bind('name=?', "Bambi\nand\nThumper".chars)
0
+  end
0
+
0
   def test_bind_record
0
     o = Struct.new(:quoted_id).new(1)
0
     assert_equal '1', bind('?', o)

0
@@ -6,6 +6,7 @@ require 'active_support/core_ext/string/iterators'
0
 require 'active_support/core_ext/string/unicode'
0
 require 'active_support/core_ext/string/xchar'
0
 require 'active_support/core_ext/string/filters'
0
+require 'active_support/core_ext/string/behavior'
0
 
0
 class String #:nodoc:
0
   include ActiveSupport::CoreExtensions::String::Access
0
@@ -15,4 +16,5 @@ class String #:nodoc:
0
   include ActiveSupport::CoreExtensions::String::StartsEndsWith
0
   include ActiveSupport::CoreExtensions::String::Iterators
0
   include ActiveSupport::CoreExtensions::String::Unicode
0
+  include ActiveSupport::CoreExtensions::String::Behavior
0
 end

0
@@ -49,6 +49,11 @@ module ActiveSupport::Multibyte #:nodoc:
0
         false
0
     end
0
 
0
+    # Enable more predictable duck-typing on String-like classes. See Object#acts_like?.
0
+    def acts_like_string?
0
+      true
0
+    end
0
+
0
     # Create a new Chars instance.
0
     def initialize(str)
0
       @string = str.respond_to?(:string) ? str.string : str

0
@@ -201,3 +201,9 @@ class StringInflectionsTest < Test::Unit::TestCase
0
     end
0
   end
0
 end
0
+
0
+class StringBehaviourTest < Test::Unit::TestCase
0
+  def test_acts_like_string
0
+    assert 'Bambi'.acts_like_string?
0
+  end
0
+end
0
\ No newline at end of file

0
@@ -167,6 +167,10 @@ class CharsTest < Test::Unit::TestCase
0
     assert_equal false, 'test'.chars.respond_to?(:a_method_that_doesnt_exist)
0
   end
0
   
0
+  def test_acts_like_string
0
+    assert 'Bambi'.chars.acts_like_string?
0
+  end
0
+
0
   protected
0
 
0
   def with_kcode(kcode)