adding a type cast method for prepared statements

3 files changed, 130 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 325665dd87..5634e53e80 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -39,6 +39,42 @@ module ActiveRecord
         end
       end
 
+      # Cast a +value+ to a type that the database understands. For example,
+      # SQLite does not understand dates, so this method will convert a Date
+      # to a String.
+      def type_cast(value, column)
+        return value.id if value.respond_to?(:quoted_id)
+
+        case value
+        when String, ActiveSupport::Multibyte::Chars
+          value = value.to_s
+          return value unless column
+
+          case column.type
+          when :binary then value
+          when :integer then value.to_i
+          when :float then value.to_f
+          else
+            value
+          end
+
+        when true, false
+          if column && column.type == :integer
+            value ? 1 : 0
+          else
+            value ? 't' : 'f'
+          end
+          # BigDecimals need to be put in a non-normalized form and quoted.
+        when nil        then nil
+        when BigDecimal then value.to_f
+        when Numeric    then value
+        when Date, Time then quoted_date(value)
+        when Symbol     then value.to_s
+        else
+          YAML.dump(value)
+        end
+      end
+
       # Quotes a string, escaping any ' (single quote) and \ (backslash)
       # characters.
       def quote_string(s)
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 8ef286b473..14c4fd689b 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -165,7 +165,7 @@ module ActiveRecord
             cols = cache[:cols] ||= stmt.columns
             stmt.reset!
             stmt.bind_params binds.map { |col, val|
-              col ? col.type_cast(val) : val
+              type_cast(val, col)
             }
           end
 
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
new file mode 100644
index 0000000000..e0152e7ccf
--- /dev/null
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -0,0 +1,93 @@
+require "cases/helper"
+require 'bigdecimal'
+require 'yaml'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLiteAdapter
+      class QuotingTest < ActiveRecord::TestCase
+        def setup
+          @conn = Base.sqlite3_connection :database => ':memory:',
+            :adapter => 'sqlite3',
+            :timeout => 100
+        end
+
+        def test_type_cast_symbol
+          assert_equal 'foo', @conn.type_cast(:foo, nil)
+        end
+
+        def test_type_cast_date
+          date = Date.today
+          expected = @conn.quoted_date(date)
+          assert_equal expected, @conn.type_cast(date, nil)
+        end
+
+        def test_type_cast_time
+          time = Time.now
+          expected = @conn.quoted_date(time)
+          assert_equal expected, @conn.type_cast(time, nil)
+        end
+
+        def test_type_cast_numeric
+          assert_equal 10, @conn.type_cast(10, nil)
+          assert_equal 2.2, @conn.type_cast(2.2, nil)
+        end
+
+        def test_type_cast_nil
+          assert_equal nil, @conn.type_cast(nil, 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)
+        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)
+        end
+
+        def test_type_cast_bigdecimal
+          bd = BigDecimal.new '10.0'
+          assert_equal bd.to_f, @conn.type_cast(bd, nil)
+        end
+
+        def test_type_cast_unknown
+          obj = Class.new.new
+          assert_equal YAML.dump(obj), @conn.type_cast(obj, nil)
+        end
+
+        def test_quoted_id
+          quoted_id_obj = Class.new {
+            def quoted_id
+              "'zomg'"
+            end
+
+            def id
+              10
+            end
+          }.new
+          assert_equal 10, @conn.type_cast(quoted_id_obj, nil)
+        end
+      end
+    end
+  end
+end