From 597d9c8af80393f8a3fffd7b935674356e9b73b5 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Sun, 25 May 2014 09:30:13 -0700
Subject: Remove checks against `column.type` in abstract adapter quoting

The intention is to eventually remove `column` from the arguments list
both for `quote` and for `type_cast` entirely. This is the first step
to that end.
---
 .../connection_adapters/abstract/quoting.rb        | 51 ++++++++--------------
 1 file changed, 17 insertions(+), 34 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters/abstract')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 0bd53a7eb0..169c00cb1a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -9,26 +9,22 @@ module ActiveRecord
         # records are quoted as their primary key
         return value.quoted_id if value.respond_to?(:quoted_id)
 
+        # FIXME: The only case we get an object other than nil or a real column
+        # is `SchemaStatements#add_column` with a PG array that has a non-empty default
+        # value. Is this really the only case? Are we missing tests for other types?
+        # We should have a real column object passed (or nil) here, and check for that
+        # instead
+        if column.respond_to?(:type_cast_for_database)
+          value = column.type_cast_for_database(value)
+        end
+
         case value
         when String, ActiveSupport::Multibyte::Chars
-          value = value.to_s
-          return "'#{quote_string(value)}'" unless column
-
-          case column.type
-          when :integer then value.to_i.to_s
-          when :float then value.to_f.to_s
-          else
-            "'#{quote_string(value)}'"
-          end
-
-        when true, false
-          if column && column.type == :integer
-            value ? '1' : '0'
-          else
-            value ? quoted_true : quoted_false
-          end
-          # BigDecimals need to be put in a non-normalized form and quoted.
+          "'#{quote_string(value.to_s)}'"
+        when true       then quoted_true
+        when false      then quoted_false
         when nil        then "NULL"
+        # BigDecimals need to be put in a non-normalized form and quoted.
         when BigDecimal then value.to_s('F')
         when Numeric, ActiveSupport::Duration then value.to_s
         when Date, Time then "'#{quoted_date(value)}'"
@@ -58,24 +54,11 @@ module ActiveRecord
 
         case value
         when String, ActiveSupport::Multibyte::Chars
-          value = value.to_s
-          return value unless column
-
-          case column.type
-          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.
+          value.to_s
+        when true       then 't'
+        when false      then 'f'
         when nil        then nil
+        # BigDecimals need to be put in a non-normalized form and quoted.
         when BigDecimal then value.to_s('F')
         when Numeric    then value
         when Date, Time then quoted_date(value)
-- 
cgit v1.2.3