1 files changed, 22 insertions, 36 deletions

diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index ba89487838..274e358e4a 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -15,76 +15,55 @@ module ActiveRecord
 
         def test_type_cast_binary_encoding_without_logger
           @conn.extend(Module.new { def logger; end })
-          column = Struct.new(:type, :name).new(:string, "foo")
           binary = SecureRandom.hex
           expected = binary.dup.encode!(Encoding::UTF_8)
-          assert_equal expected, @conn.type_cast(binary, column)
+          assert_equal expected, @conn.type_cast(binary)
         end
 
         def test_type_cast_symbol
-          assert_equal 'foo', @conn.type_cast(:foo, nil)
+          assert_equal 'foo', @conn.type_cast(:foo)
         end
 
         def test_type_cast_date
           date = Date.today
           expected = @conn.quoted_date(date)
-          assert_equal expected, @conn.type_cast(date, nil)
+          assert_equal expected, @conn.type_cast(date)
         end
 
         def test_type_cast_time
           time = Time.now
           expected = @conn.quoted_date(time)
-          assert_equal expected, @conn.type_cast(time, nil)
+          assert_equal expected, @conn.type_cast(time)
         end
 
         def test_type_cast_numeric
-          assert_equal 10, @conn.type_cast(10, nil)
-          assert_equal 2.2, @conn.type_cast(2.2, nil)
+          assert_equal 10, @conn.type_cast(10)
+          assert_equal 2.2, @conn.type_cast(2.2)
         end
 
         def test_type_cast_nil
-          assert_equal nil, @conn.type_cast(nil, nil)
+          assert_equal nil, @conn.type_cast(nil)
         end
 
         def test_type_cast_true
-          c = Column.new(nil, 1, 'int')
-          assert_equal 't', @conn.type_cast(true, nil)
-          assert_equal 1, @conn.type_cast(true, c)
+          assert_equal 't', @conn.type_cast(true)
         end
 
         def test_type_cast_false
-          c = Column.new(nil, 1, 'int')
-          assert_equal 'f', @conn.type_cast(false, nil)
-          assert_equal 0, @conn.type_cast(false, c)
-        end
-
-        def test_type_cast_string
-          assert_equal '10', @conn.type_cast('10', nil)
-
-          c = Column.new(nil, 1, 'int')
-          assert_equal 10, @conn.type_cast('10', c)
-
-          c = Column.new(nil, 1, 'float')
-          assert_equal 10.1, @conn.type_cast('10.1', c)
-
-          c = Column.new(nil, 1, 'binary')
-          assert_equal '10.1', @conn.type_cast('10.1', c)
-
-          c = Column.new(nil, 1, 'date')
-          assert_equal '10.1', @conn.type_cast('10.1', c)
+          assert_equal 'f', @conn.type_cast(false)
         end
 
         def test_type_cast_bigdecimal
           bd = BigDecimal.new '10.0'
-          assert_equal bd.to_f, @conn.type_cast(bd, nil)
+          assert_equal bd.to_f, @conn.type_cast(bd)
         end
 
         def test_type_cast_unknown_should_raise_error
           obj = Class.new.new
-          assert_raise(TypeError) { @conn.type_cast(obj, nil) }
+          assert_raise(TypeError) { @conn.type_cast(obj) }
         end
 
-        def test_quoted_id
+        def test_type_cast_object_which_responds_to_quoted_id
           quoted_id_obj = Class.new {
             def quoted_id
               "'zomg'"
@@ -94,14 +73,21 @@ module ActiveRecord
               10
             end
           }.new
-          assert_equal 10, @conn.type_cast(quoted_id_obj, nil)
+          assert_equal 10, @conn.type_cast(quoted_id_obj)
 
           quoted_id_obj = Class.new {
             def quoted_id
               "'zomg'"
             end
-          }
-          assert_raise(TypeError) { @conn.type_cast(quoted_id_obj, nil) }
+          }.new
+          assert_raise(TypeError) { @conn.type_cast(quoted_id_obj) }
+        end
+
+        def test_quoting_binary_strings
+          value = "hello".encode('ascii-8bit')
+          type = SQLite3String.new
+
+          assert_equal "'hello'", @conn.quote(type.type_cast_for_database(value))
         end
       end
     end