Merge pull request #15802 from sgrif/sg-column-quoting

Don't use column object for type casting in `quoting`

2 files changed, 6 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 04ae67234f..ff92375820 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -14,8 +14,8 @@ module ActiveRecord
         # 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)
+        if column.respond_to?(:cast_type)
+          value = column.cast_type.type_cast_for_database(value)
         end
 
         _quote(value)
@@ -34,8 +34,8 @@ module ActiveRecord
         # 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)
+        if column.respond_to?(:cast_type)
+          value = column.cast_type.type_cast_for_database(value)
         end
 
         _type_cast(value)
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 17fabe5af6..3fea8f490d 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -179,8 +179,8 @@ module ActiveRecord
         end
 
         def array_column(column)
-          if column.array && !column.respond_to?(:type_cast_for_database)
-            OID::Array.new(AdapterProxyType.new(column, self))
+          if column.array && !column.respond_to?(:cast_type)
+            Column.new('', nil, OID::Array.new(AdapterProxyType.new(column, self)))
           else
             column
           end