From 228aa4fff8d91a179abc81be7891d5a8772257c3 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sun, 29 Jun 2014 13:02:49 -0600 Subject: Remove array workaround in PG quoting We no longer need to do fancy legwork to make sure arrays use a type object, now that schema methods use a real type object. --- .../connection_adapters/postgresql/quoting.rb | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb index 07171a75d5..f2f2a3023f 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb @@ -27,8 +27,6 @@ module ActiveRecord else super end - when Array - super(value, array_column(column)) when Hash case sql_type when 'hstore' then super(PostgreSQLColumn.hstore_to_string(value), column) @@ -83,8 +81,6 @@ module ActiveRecord else super(value, column) end - when Array - super(value, array_column(column)) when Hash case column.sql_type when 'hstore' then PostgreSQLColumn.hstore_to_string(value, array_member) @@ -165,26 +161,6 @@ module ActiveRecord super end end - - def array_column(column) - if column.array && !column.respond_to?(:cast_type) - Column.new('', nil, OID::Array.new(AdapterProxyType.new(column, self))) - else - column - end - end - - class AdapterProxyType < SimpleDelegator # :nodoc: - def initialize(column, adapter) - @column = column - @adapter = adapter - super(column) - end - - def type_cast_for_database(value) - @adapter.type_cast(value, @column) - end - end end end end -- cgit v1.2.3