From b404613c977a5cc31c6748723e903fa5a0709c3b Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Sat, 28 Jun 2014 14:44:49 -0600
Subject: Always pass a column with a type object to quote

The only case where we got a column that was not `nil`, but did not
respond to `cast_type` was when type casting the default value during
schema creation. We can look up the cast type, and add that object to
the column definition. Will allow us to consistently rely on the type
objects for type casting in all directions.
---
 activerecord/test/cases/adapters/sqlite3/quoting_test.rb |  4 ++--
 activerecord/test/cases/quoting_test.rb                  | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index 8c9a051eea..3bd53aa278 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -15,10 +15,10 @@ module ActiveRecord
 
         def test_type_cast_binary_encoding_without_logger
           @conn.extend(Module.new { def logger; end })
-          cast_type = Type::String.new
+          column = Column.new(nil, nil, Type::String.new)
           binary = SecureRandom.hex
           expected = binary.dup.encode!(Encoding::UTF_8)
-          assert_equal expected, @conn.type_cast(binary, cast_type)
+          assert_equal expected, @conn.type_cast(binary, column)
         end
 
         def test_type_cast_symbol
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 70d9b9dbf5..1d6ae2f67f 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -83,12 +83,10 @@ module ActiveRecord
 
       def test_quote_with_quoted_id
         assert_equal 1, @quoter.quote(Struct.new(:quoted_id).new(1), nil)
-        assert_equal 1, @quoter.quote(Struct.new(:quoted_id).new(1), 'foo')
       end
 
       def test_quote_nil
         assert_equal 'NULL', @quoter.quote(nil, nil)
-        assert_equal 'NULL', @quoter.quote(nil, 'foo')
       end
 
       def test_quote_true
@@ -102,48 +100,39 @@ module ActiveRecord
       def test_quote_float
         float = 1.2
         assert_equal float.to_s, @quoter.quote(float, nil)
-        assert_equal float.to_s, @quoter.quote(float, Object.new)
       end
 
       def test_quote_fixnum
         fixnum = 1
         assert_equal fixnum.to_s, @quoter.quote(fixnum, nil)
-        assert_equal fixnum.to_s, @quoter.quote(fixnum, Object.new)
       end
 
       def test_quote_bignum
         bignum = 1 << 100
         assert_equal bignum.to_s, @quoter.quote(bignum, nil)
-        assert_equal bignum.to_s, @quoter.quote(bignum, Object.new)
       end
 
       def test_quote_bigdecimal
         bigdec = BigDecimal.new((1 << 100).to_s)
         assert_equal bigdec.to_s('F'), @quoter.quote(bigdec, nil)
-        assert_equal bigdec.to_s('F'), @quoter.quote(bigdec, Object.new)
       end
 
       def test_dates_and_times
         @quoter.extend(Module.new { def quoted_date(value) 'lol' end })
         assert_equal "'lol'", @quoter.quote(Date.today, nil)
-        assert_equal "'lol'", @quoter.quote(Date.today, Object.new)
         assert_equal "'lol'", @quoter.quote(Time.now, nil)
-        assert_equal "'lol'", @quoter.quote(Time.now, Object.new)
         assert_equal "'lol'", @quoter.quote(DateTime.now, nil)
-        assert_equal "'lol'", @quoter.quote(DateTime.now, Object.new)
       end
 
       def test_crazy_object
         crazy = Class.new.new
         expected = "'#{YAML.dump(crazy)}'"
         assert_equal expected, @quoter.quote(crazy, nil)
-        assert_equal expected, @quoter.quote(crazy, Object.new)
       end
 
       def test_crazy_object_calls_quote_string
         crazy = Class.new { def initialize; @lol = 'lo\l' end }.new
         assert_match "lo\\\\l", @quoter.quote(crazy, nil)
-        assert_match "lo\\\\l", @quoter.quote(crazy, Object.new)
       end
 
       def test_quote_string_no_column
-- 
cgit v1.2.3