Permalink
Browse files

Move away from column.sql_type in untested code too

  • Loading branch information...
1 parent 336b376 commit f8675eb064e5aa052da7a5b9b5d3aa390822bf47 @MSch MSch committed Mar 25, 2013
Showing with 6 additions and 5 deletions.
  1. +6 −5 activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -83,9 +83,10 @@ def quote(value, column = nil) #:nodoc:
def type_cast(value, column, array_member = false)
return super(value, column) unless column
+ sql_type = type_to_sql(column.type, column.limit, column.precision, column.scale)
case value
when Range
- return super(value, column) unless /range$/ =~ column.sql_type
+ return super(value, column) unless /range$/ =~ sql_type
PostgreSQLColumn.range_to_string(value)
when NilClass
if column.array && array_member
@@ -96,23 +97,23 @@ def type_cast(value, column, array_member = false)
super(value, column)
end
when Array
- case column.sql_type
+ case sql_type
when 'point' then PostgreSQLColumn.point_to_string(value)
else
return super(value, column) unless column.array
PostgreSQLColumn.array_to_string(value, column, self)
end
when String
- return super(value, column) unless 'bytea' == column.sql_type
+ return super(value, column) unless 'bytea' == sql_type
{ :value => value, :format => 1 }
when Hash
- case column.sql_type
+ case sql_type
when 'hstore' then PostgreSQLColumn.hstore_to_string(value)
when 'json' then PostgreSQLColumn.json_to_string(value)
else super(value, column)
end
when IPAddr
- return super(value, column) unless ['inet','cidr'].include? column.sql_type
+ return super(value, column) unless ['inet','cidr'].include? sql_type
PostgreSQLColumn.cidr_to_string(value)
else
super(value, column)

0 comments on commit f8675eb

Please sign in to comment.